Skip to content

A platform for community discussion. Free, open, simple.

FEATURE: Allow inviting new users directly as admins (#41748)

Keegan Georgeabe57008383a
diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index 4094764e52b..2bc3647f0b3 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -171,7 +171,8 @@ html:not(.keyboard-visible).mobile-device {
&[type="text"],
&[type="password"],
- &[type="number"] {
+ &[type="number"],
+ &[type="email"] {
width: 100%;
}
}
diff --git a/app/assets/stylesheets/common/modal/_index.scss b/app/assets/stylesheets/common/modal/_index.scss
index 6b8b9337887..263cd367253 100644
--- a/app/assets/stylesheets/common/modal/_index.scss
+++ b/app/assets/stylesheets/common/modal/_index.scss
@@ -2,5 +2,6 @@
@import "user-status";
@import "discourse-reactions-popup";
@import "change-reply-to";
+@import "create-invite-with-roles";
@import "manage-reports-modal";
@import "share-target";
diff --git a/app/assets/stylesheets/common/modal/create-invite-with-roles.scss b/app/assets/stylesheets/common/modal/create-invite-with-roles.scss
new file mode 100644
index 00000000000..c426b00a372
--- /dev/null
+++ b/app/assets/stylesheets/common/modal/create-invite-with-roles.scss
@@ -0,0 +1,161 @@
+.create-invite-with-roles-modal {
+ .d-modal__container {
+ width: 32em;
+ max-width: 100%;
+ }
+
+ &__role {
+ margin-bottom: 1em;
+ }
+
+ &__role-toggle {
+ display: flex;
+ gap: 0.5em;
+ margin: 0;
+ padding: 0;
+ border: 0;
+ }
+
+ &__role-option {
+ flex: 1;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ gap: 0.5em;
+ padding: 0.5em 0.75em;
+ margin: 0;
+ border: 1px solid var(--primary-low);
+ border-radius: var(--d-button-border-radius, 4px);
+ background: var(--secondary);
+ color: var(--primary-high);
+ font-weight: 500;
+ cursor: pointer;
+
+ input {
+ position: absolute;
+ opacity: 0;
+ pointer-events: none;
+ }
+
+ .d-icon {
+ color: currentcolor;
+ }
+
+ &:hover {
+ background: var(--d-hover);
+ }
+
+ &.--active {
+ border-color: var(--tertiary);
+ background: var(--tertiary);
+ color: var(--secondary);
+ font-weight: 600;
+ }
+
+ &.--disabled {
+ opacity: 0.55;
+ pointer-events: none;
+ }
+
+ &:focus-within {
+ outline: 2px solid var(--tertiary);
+ outline-offset: 1px;
+ }
+ }
+
+ &__role-description {
+ margin: 0.75em 0 0;
+ color: var(--primary-high);
+ }
+
+ &__role-locked {
+ color: var(--primary-medium);
+ font-size: var(--font-down-1);
+ }
+
+ &__delivery {
+ margin: 0 0 1em;
+ padding: 0;
+ border: 0;
+ }
+
+ &__delivery-label {
+ padding: 0;
+ margin-bottom: 0.5em;
+ font-weight: bold;
+ }
+
+ &__delivery-option {
+ display: inline-flex;
+ align-items: center;
+ gap: 0.5em;
+ margin-right: 1.5em;
+ font-weight: 500;
+ cursor: pointer;
+
+ input {
+ margin: 0;
+ }
+ }
+
+ &__sent-to {
+ margin-top: 0;
+ }
+
+ &__link-share {
+ display: flex;
+ gap: 0.5em;
+ margin-bottom: 1em;
+
+ input.invite-link {
+ flex: 1;
+ margin-bottom: 0;
+ }
+ }
+
+ &__summary-rows {
+ margin: 0;
+ border-top: 1px solid var(--content-border-color);
+ }
+
+ &__summary-row {
+ display: flex;
+ justify-content: space-between;
+ gap: 1em;
+ padding: 0.5em 0;
+ border-bottom: 1px solid var(--content-border-color);
+
+ dt {
+ color: var(--primary-medium);
+ font-weight: normal;
+ }
+
+ dd {
+ margin: 0;
+ text-align: right;
+ overflow-wrap: anywhere;
+ }
+ }
+
+ &__email-sent {
+ h3 {
+ margin-top: 0;
+ }
+ }
+
+ .d-modal__footer {
+ .toggle-advanced {
+ margin-left: auto;
+
+ &.--active {
+ --d-button-default-bg-color: var(--tertiary-low);
+ --d-button-default-bg-color--hover: var(--tertiary-low);
+ --d-button-default-text-color: var(--tertiary-high);
+ --d-button-default-text-color--hover: var(--tertiary-hover);
+ --d-button-default-icon-color: var(--tertiary-high);
+ --d-button-default-icon-color--hover: var(--tertiary-hover);
+ border-color: var(--tertiary);
+ }
+ }
+ }
+}
diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb
index c6ccd2e25cf..f802dfd9a8d 100644
--- a/app/controllers/invites_controller.rb
+++ b/app/controllers/invites_controller.rb
@@ -122,6 +122,25 @@ class InvitesController < ApplicationController
end
def create
+ is_admin_invite = params[:is_admin].to_s == "true"
+
+ if is_admin_invite
+ guardian.ensure_can_create_admin_invite!
+
+ if params[:topic_id].present? || params[:group_ids].present? ||
+ params[:group_names].present? || params[:domain].present?
+ raise Discourse::InvalidParameters.new(:is_admin)
+ end
+
+ RateLimiter.new(
+ current_user,
+ "admin-invites-per-day",
+ 10,
+ 1.day,
+ apply_limit_to_staff: true,
+ ).performed!
+ end
+
if params[:topic_id].present?
topic = Topic.find_by(id: params[:topic_id])
raise Discourse::InvalidParameters.new(:topic_id) if topic.blank?
@@ -152,7 +171,8 @@ class InvitesController < ApplicationController
skip_email: skip_email_param,
invited_by: current_user,
custom_message: params[:custom_message],
- max_redemptions_allowed: params[:max_redemptions_allowed],
+ max_redemptions_allowed: is_admin_invite ? nil : params[:max_redemptions_allowed],
+ admin: is_admin_invite,
topic_id: topic&.id,
group_ids: groups&.map(&:id),
expires_at: params[:expires_at],
@@ -199,6 +219,12 @@ class InvitesController < ApplicationController
invite = Invite.find_by(invited_by: current_user, id: params[:id])
raise Discourse::InvalidParameters.new(:id) if invite.blank?
+ if invite.admin?
+ %i[topic_id group_ids group_names].each do |param|
+ raise Discourse::InvalidParameters.new(param) if params[param].present?
+ end
+ end
+
if params[:topic_id].present?
topic = Topic.find_by(id: params[:topic_id])
raise Discourse::InvalidParameters.new(:topic_id) if topic.blank?
diff --git a/app/models/invite.rb b/app/models/invite.rb
index 1419ac96d35..5c0617c0d93 100644
--- a/app/models/invite.rb
+++ b/app/models/invite.rb
@@ -39,6 +39,7 @@ class Invite < ActiveRecord::Base
validate :valid_domain, if: :will_save_change_to_domain?
validate :user_doesnt_already_exist, if: :will_save_change_to_email?
validate :email_xor_domain
+ validate :ensure_valid_admin_invite, if: :admin?
before_create do
self.invite_key ||= SecureRandom.base58(10)
@@ -169,11 +170,15 @@ class Invite < ActiveRecord::Base
end
if invite
+ was_admin = invite.admin?
invite.update_columns(
created_at: Time.zone.now,
updated_at: Time.zone.now,
expires_at: opts[:expires_at] || time_zone.now + SiteSetting.invite_expiry_days.days,
emailed_status: emailed_status,
+ # update_columns skips validations, so the inviter check from
+ # ensure_valid_admin_invite has to be re-applied here
+ admin: !!opts[:admin] && !!invited_by&.admin?,
)
else
create_args =
@@ -182,6 +187,7 @@ class Invite < ActiveRecord::Base
:description,
:domain,
:moderator,
+ :admin,
:custom_message,
:max_redemptions_allowed,
)
@@ -194,12 +200,21 @@ class Invite < ActiveRecord::Base
invite = Invite.create!(create_args)
end
- topic_id = opts[:topic]&.id || opts[:topic_id]
- invite.topic_invites.find_or_create_by!(topic_id: topic_id) if topic_id.present?
+ DiscourseEvent.trigger(:admin_invite_created, invite) if invite.admin? && !was_admin
- group_ids = opts[:group_ids]
- if group_ids.present?
- group_ids.each { |group_id| invite.invited_groups.find_or_create_by!(group_id: group_id) }
+ if invite.admin?
+ # admin invites never carry topic or group associations; clear any left
+ # over from a reused member invite
+ invite.topic_invites.destroy_all
+ invite.invited_groups.destroy_all
+ else
+ topic_id = opts[:topic]&.id || opts[:topic_id]
+ invite.topic_invites.find_or_create_by!(topic_id: topic_id) if topic_id.present?
+
+ group_ids = opts[:group_ids]
+ if group_ids.present?
+ group_ids.each { |group_id| invite.invited_groups.find_or_create_by!(group_id: group_id) }
+ end
end
if emailed_status == emailed_status_types[:pending]
@@ -345,6 +360,16 @@ class Invite < ActiveRecord::Base
end
end
+ def ensure_valid_admin_invite
+ errors.add(:base, I18n.t("invite.admin_invite_requires_email")) if email.blank?
+
+ # only checked when the flag is set so that later saves (e.g. marking the
+ # invite redeemed) don't fail if the inviter has since been demoted
+ if (new_record? || will_save_change_to_admin?) && !invited_by&.admin?
+ errors.add(:base, I18n.t("invite.admin_invite_requires_admin_inviter"))
+ end
+ end
+
def valid_domain
return if domain.blank?
@@ -365,6 +390,7 @@ end
# Table name: invites
#
# id :integer not null, primary key
+# admin :boolean default(FALSE), not null
# custom_message :text
# deleted_at :datetime
# description :string(100)
diff --git a/app/models/invite_redeemer.rb b/app/models/invite_redeemer.rb
index 880dca5af28..f86a0ce069a 100644
--- a/app/models/invite_redeemer.rb
+++ b/app/models/invite_redeemer.rb
@@ -134,7 +134,10 @@ class InviteRedeemer
user.custom_fields = fields
end
- user.moderator = true if invite.moderator? && invite.invited_by.staff?
+ if (invite.moderator? && invite.invited_by.staff?) ||
+ InviteRedeemer.admin_invite_grantable?(invite)
+ user.moderator = true
+ end
if password
user.password = password
@@ -164,6 +167,11 @@ class InviteRedeemer
User.find(user.id)
end
+ def self.admin_invite_grantable?(invite)
+ invite.admin? && invite.invited_by&.admin? &&
+ UpcomingChanges.enabled_for_user?(:enable_invite_modal_with_roles, invite.invited_by)
+ end
+
private
def can_redeem_invite?
@@ -238,6 +246,21 @@ class InviteRedeemer
add_user_to_groups
send_welcome_message
notify_invitee
+ create_admin_grant_confirmation
+ end
+
+ # Admin invites grant moderator right away; full admin requires the inviter
+ # to confirm via the same email confirmation used when granting admin from
+ # the admin user page.
+ def create_admin_grant_confirmation
+ return if !InviteRedeemer.admin_invite_grantable?(invite)
+
+ invited_user.grant_moderation! if !invited_user.moderator?
+ StaffActionLogger.new(invite.invited_by).log_grant_moderation(invited_user)
+
+ if invite.invited_by.guardian.can_grant_admin?(invited_user)
+ AdminConfirmation.new(invited_user, invite.invited_by).create_confirmation
+ end
end
def mark_invite_redeemed
diff --git a/app/serializers/current_user_serializer.rb b/app/serializers/current_user_serializer.rb
index 0810f6d716a..51376754334 100644
--- a/app/serializers/current_user_serializer.rb
+++ b/app/serializers/current_user_serializer.rb
@@ -24,6 +24,7 @@ class CurrentUserSerializer < BasicUserSerializer
:can_upload_avatar,
:can_edit,
:can_invite_to_forum,
+ :can_create_admin_invite,
:no_password,
:can_delete_account,
:can_post_anonymously,
@@ -236,6 +237,14 @@ class CurrentUserSerializer < BasicUserSerializer
scope.can_invite_to_forum?
end
+ def can_create_admin_invite
+ true
+ end
+
+ def include_can_create_admin_invite?
+ scope.can_create_admin_invite?
+ end
+
def no_password
true
end
diff --git a/app/serializers/invite_serializer.rb b/app/serializers/invite_serializer.rb
index b3df5434e35..79c3e72521d 100644
--- a/app/serializers/invite_serializer.rb
+++ b/app/serializers/invite_serializer.rb
@@ -15,7 +15,8 @@ class InviteSerializer < ApplicationSerializer
:created_at,
:updated_at,
:expires_at,
- :expired
+ :expired,
+ :grants_admin
has_many :topics, embed: :object, serializer: BasicTopicSerializer
has_many :groups, embed: :object, serializer: BasicGroupSerializer
@@ -80,6 +81,14 @@ class InviteSerializer < ApplicationSerializer
object.expired?
end
+ def grants_admin
+ object.admin?
+ end
+
+ def include_grants_admin?
+ can_see_invite_details?
+ end
+
private
def can_see_invite_details?
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index b05fd29ade4..1dd7ef9dbac 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -2525,6 +2525,53 @@ en:
invite_saved_without_sending_email: "Invite saved. Copy the link below and share it to instantly grant access to this site."
invite_saved_with_sending_email: "Invite email has been sent. You can also copy the link below and share it to instantly grant access to this site."
+ invite_roles:
+ member_title: "Invite members"
+ admin_title: "Invite admins"
+ edit_title: "Editing invite"
+ created_title: "Invite created"
+ sent_title: "Invitation sent"
+ member_tab: "Members"
+ admin_tab: "Admins"
+ member_description: "Invite people to join this site. Share a link or send an email invitation."
+ admin_description: "Invite people to join your staff as admins. Admins have full access to this site."
+ admin_email_label: "Email address"
+ member_email_label: "Send to"
+ member_email_help: "We'll email an invitation link to this address."
+ email_placeholder: "[email protected]"
+ invite_by: "Invite by"
+ invite_by_link: "Shareable link"
+ invite_by_email: "Email"
+ role_label: "Invite as"
+ restrict_domain: "Restrict to domain"
+ restrict_domain_help: "Only people with an email at this domain can accept the link. To invite a specific person, use Email above."
+ domain_placeholder: "example.com"
+ domain_invalid: "Enter a valid domain, e.g. example.com"
+ arrive_at_topic_help: "Send people to a specific topic after they accept."
+ create_and_send: "Create & send"
+ create_and_copy: "Create & copy link"
+ more_options: "More options"
+ fewer_options: "Fewer options"
+ update: "Update"
+ role_locked: "The invite type can't be changed after the invite is created."
+ summary:
+ sent_to: "An invitation was emailed to %{email}. You can also share this link directly:"
+ role: "Role"
+ role_member: "Member"
+ role_admin: "Admin"
+ method: "Sharing"
+ method_link: "Shareable link"
+ method_email: "Email"
+ restriction: "Restricted to"
+ uses: "Max uses"
+ expires: "Expires"
+ topic: "Topic"
+ groups: "Groups"
+ edit: "Edit invite"
+ view_invites: "View invites"
+ email_sent:
+ body: "An invitation was emailed to %{email}."
+
bulk_invite:
none: "No invitations to display on this page."
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index fc02b68adf0..53090d5bfb0 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -434,6 +434,8 @@ en:
max_redemptions_allowed_one: "for email invites should be 1."
redemption_count_less_than_max: "should be less than %{max_redemptions_allowed}."
email_xor_domain: "Email and domain fields are not allowed at the same time"
+ admin_invite_requires_email: "Admin invites must be sent to an email address"
+ admin_invite_requires_admin_inviter: "Only admins can create admin invites"
existing_user_success: "Invite redeemed successfully"
email_invites_disabled: "Sending invite emails is disabled"
@@ -2938,6 +2940,7 @@ en:
enable_horizon_high_context_topic_cards: "Shows richer topic cards in the Horizon theme, including topic excerpts, tags, and plugin extended information."
granular_anonymous_and_logged_in_groups_permissions: "Makes group-based site setting permissions treat 'everyone' as 'all logged-in users', and enables the new 'anonymous_users' and 'logged_in_users' pseudogroups so admins can explicitly target anonymous visitors and authenticated users."
dashboard_improvements: "Enables the redesigned admin dashboard that lets you pin custom reports and includes improved site traffic, engagement, and other analytics tied to community success and value."
+ enable_invite_modal_with_roles: "Enables a redesigned invite flow that lets admins invite someone directly as an admin. The invitee becomes a moderator on signup and an admin once the inviter confirms via email."
errors:
invalid_css_color: "Invalid color. Enter a color name or hex value."
diff --git a/config/site_settings.yml b/config/site_settings.yml
index cf5833379bd..c6a66ec80bd 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -4678,3 +4678,11 @@ experimental:
admin_dashboard_reports_seeded:
default: false
hidden: true
+ enable_invite_modal_with_roles:
+ default: false
+ hidden: true
+ client: true
+ upcoming_change:
+ status: "experimental"
+ impact: "feature,admins"
+ learn_more_url: "https://meta.discourse.org/t/-/407727"
diff --git a/db/migrate/20260715183411_add_admin_to_invites.rb b/db/migrate/20260715183411_add_admin_to_invites.rb
new file mode 100644
index 00000000000..b67f799d82d
--- /dev/null
+++ b/db/migrate/20260715183411_add_admin_to_invites.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+class AddAdminToInvites < ActiveRecord::Migration[8.0]
+ def change
+ add_column :invites, :admin, :boolean, default: false, null: false
+ end
+end
diff --git a/db/structure.sql b/db/structure.sql
index 9e488631c88..ecf0f0fc76a 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -6454,7 +6454,8 @@ CREATE TABLE public.invites (
expires_at timestamp without time zone NOT NULL,
email_token character varying,
domain character varying,
- description character varying(100)
+ description character varying(100),
+ admin boolean DEFAULT false NOT NULL
);
@@ -22648,6 +22649,7 @@ ALTER TABLE ONLY public.ad_plugin_house_ads_groups
SET search_path TO "$user", public;
INSERT INTO "schema_migrations" (version) VALUES
+('20260715183411'),
('20260715090434'),
('20260715090355'),
('20260715064155'),
diff --git a/frontend/discourse/app/components/admin-onboarding/banner.gjs b/frontend/discourse/app/components/admin-onboarding/banner.gjs
index e35afd126ac..76794f6f436 100644
--- a/frontend/discourse/app/components/admin-onboarding/banner.gjs
+++ b/frontend/discourse/app/components/admin-onboarding/banner.gjs
@@ -10,7 +10,7 @@ import StartPostingOptions from "discourse/components/admin-onboarding/modal/sta
import ThemePickerModal from "discourse/components/admin-onboarding/modal/theme-picker";
import PredefinedTopicOption from "discourse/components/admin-onboarding/predefined-topics-option";
import OnboardingStep from "discourse/components/admin-onboarding/step";
-import CreateInvite from "discourse/components/modal/create-invite";
+import { showCreateInviteModal } from "discourse/lib/invite-modal";
import { applyValueTransformer } from "discourse/lib/transformer";
import { defaultHomepage } from "discourse/lib/utilities";
import DButton from "discourse/ui-kit/d-button";
@@ -34,7 +34,6 @@ const STEPS = [
class InviteCollaborators extends OnboardingStep {
static name = "invite_collaborators";
- @service modal;
@service appEvents;
icon = "paper-plane";
@@ -51,8 +50,8 @@ const STEPS = [
@action
performAction() {
- this.modal.show(CreateInvite, {
- model: { invites: trackedArray() },
+ showCreateInviteModal(this, {
+ model: { invites: trackedArray(), defaultRole: "admin" },
});
}
},
diff --git a/frontend/discourse/app/components/modal/create-invite-with-roles.gjs b/frontend/discourse/app/components/modal/create-invite-with-roles.gjs
new file mode 100644
index 00000000000..89422506c88
--- /dev/null
+++ b/frontend/discourse/app/components/modal/create-invite-with-roles.gjs
@@ -0,0 +1,943 @@
+import Component from "@glimmer/component";
+import { cached, tracked } from "@glimmer/tracking";
+import { array, fn, hash } from "@ember/helper";
+import { on } from "@ember/modifier";
+import { action } from "@ember/object";
+import { LinkTo } from "@ember/routing";
+import { service } from "@ember/service";
+import { trustHTML } from "@ember/template";
+import Form from "discourse/components/form";
+import PluginOutlet from "discourse/components/plugin-outlet";
+import lazyHash from "discourse/helpers/lazy-hash";
+import { extractError } from "discourse/lib/ajax-error";
+import { INVITE_DESCRIPTION_MAX_LENGTH } from "discourse/lib/constants";
+import { shortDate } from "discourse/lib/formatter";
+import { canNativeShare, nativeShare } from "discourse/lib/pwa-utils";
+import { sanitize } from "discourse/lib/text";
+import {
+ clipboardCopyAsync,
+ emailValid,
+ hostnameValid,
+} from "discourse/lib/utilities";
+import Invite from "discourse/models/invite";
+import { FORMAT as DATE_INPUT_FORMAT } from "discourse/select-kit/components/future-date-input-selector";
+import GroupChooser from "discourse/select-kit/components/group-chooser";
+import TopicChooser from "discourse/select-kit/components/topic-chooser";
+import { eq } from "discourse/truth-helpers";
+import DButton from "discourse/ui-kit/d-button";
+import DCopyButton from "discourse/ui-kit/d-copy-button";
+import DFutureDateInput from "discourse/ui-kit/d-future-date-input";
+import DModal from "discourse/ui-kit/d-modal";
+import dIcon from "discourse/ui-kit/helpers/d-icon";
+import { i18n } from "discourse-i18n";
+
+const FORM = "form";
+const SUMMARY = "summary";
+const EMAIL_SENT = "email-sent";
+
+export default class CreateInviteWithRoles extends Component {
+ @service appEvents;
+ @service currentUser;
+ @service site;
+ @service siteSettings;
+
+ @tracked saving = false;
+ @tracked showAdvanced = false;
+ @tracked screen = FORM;
+ @tracked role;
+ @tracked delivery;
+ @tracked submitForcedDisabled = false;
+ @tracked flashText;
+ @tracked flashClass = "info";
+
+ @tracked topics = this.invite.topics ?? this.model.topics ?? [];
+ model = this.args.model;
+ invite = this.model.invite ?? Invite.create();
+
+ allGroups = this.site.groups.filter((g) => !g.automatic);
+ cameFromSummary = false;
+ formApi;
+
+ constructor() {
+ super(...arguments);
+
+ if (this.inviteCreated) {
+ this.role = this.invite.grants_admin ? "admin" : "member";
+ this.delivery = this.invite.email ? "email" : "link";
+ } else {
+ this.role =
+ this.model.defaultRole === "admin" && this.canInviteAdmins
+ ? "admin"
+ : "member";
+ this.delivery = "link";
+ }
+ }
+
+ get canInviteAdmins() {
+ return !!this.currentUser?.can_create_admin_invite;
+ }
+
+ get roleItems() {
+ return [
+ {
+ value: "member",
+ label: i18n("user.invited.invite_roles.member_tab"),
+ icon: "user",
+ disabled: this.inviteCreated && this.isAdminInvite,
+ },
+ {
+ value: "admin",
+ label: i18n("user.invited.invite_roles.admin_tab"),
+ icon: "shield-halved",
+ disabled: this.inviteCreated && !this.isAdminInvite,
+ },
+ ];
+ }
+
+ get isAdminInvite() {
+ return this.role === "admin";
+ }
+
+ get isEmailDelivery() {
+ return this.isAdminInvite || this.delivery === "email";
+ }
+
+ get inviteCreated() {
+ return !!this.invite.get("id");
+ }
+
+ get title() {
+ if (this.screen === SUMMARY) {
+ return this.invite.email
+ ? i18n("user.invited.invite_roles.sent_title")
+ : i18n("user.invited.invite_roles.created_title");
+ }
+
+ if (this.screen === EMAIL_SENT) {
+ return i18n("user.invited.invite_roles.sent_title");
+ }
+
+ if (this.inviteCreated || this.model.editing) {
+ return i18n("user.invited.invite_roles.edit_title");
+ }
+
+ return this.isAdminInvite
+ ? i18n("user.invited.invite_roles.admin_title")
+ : i18n("user.invited.invite_roles.member_title");
+ }
+
+ get roleDescription() {
+ return this.isAdminInvite
+ ? i18n("user.invited.invite_roles.admin_description")
+ : i18n("user.invited.invite_roles.member_description");
+ }
+
+ get descriptionValidation() {
+ return `length:0,${INVITE_DESCRIPTION_MAX_LENGTH}`;
+ }
+
+ get maxRedemptionsAllowedLimit() {
+ if (this.currentUser.staff) {
+ return this.siteSettings.invite_link_max_redemptions_limit;
+ }
+
+ return this.siteSettings.invite_link_max_redemptions_limit_users;
+ }
+
+ get defaultRedemptionsAllowed() {
+ const max = this.maxRedemptionsAllowedLimit;
+ const val = this.currentUser.staff ? 100 : 10;
+ return Math.min(max, val);
+ }
+
+ get canInviteToGroup() {
+ return (
+ this.currentUser.staff ||
+ this.currentUser.groups.some((g) => g.group_user?.owner)
+ );
+ }
+
+ get canArriveAtTopic() {
+ return this.currentUser.staff && !this.siteSettings.must_approve_users;
+ }
+
+ get expireAfterOptions() {
+ let list = [1, 7, 30, 90];
+
+ if (!list.includes(this.siteSettings.invite_expiry_days)) {
+ list.push(this.siteSettings.invite_expiry_days);
+ }
+
+ list = list
+ .sort((a, b) => a - b)
+ .map((days) => {
+ return {
+ value: days,
+ text: i18n("dates.medium.x_days", { count: days }),
+ };
+ });
+
+ list.push({
+ value: 999999,
+ text: i18n("time_shortcut.never"),
+ });
+
+ return list;
+ }
+
+ @cached
+ get adminFormData() {
+ const data = {
+ email: this.invite.email ?? "",
+ description: this.invite.description ?? "",
+ customMessage: this.invite.custom_message ?? "",
+ };
+
+ if (this.inviteCreated) {
+ data.expiresAt = this.invite.expires_at;
+ } else {
+ data.expiresAfterDays = this.siteSettings.invite_expiry_days;
+ }
+
+ return data;
+ }
+
+ @cached
+ get memberFormData() {
+ const data = {
+ email: this.invite.email ?? "",
+ domain: this.invite.domain ?? "",
+ description: this.invite.description ?? "",
+ maxRedemptions:
+ this.invite.max_redemptions_allowed ?? this.defaultRedemptionsAllowed,
+ inviteToTopic: this.model.topicId ?? this.invite.topicId,
+ inviteToGroups: this.model.groupIds ?? this.invite.groupIds ?? [],
+ customMessage: this.invite.custom_message ?? "",
+ };
+
+ if (this.inviteCreated) {
+ data.expiresAt = this.invite.expires_at;
+ } else {
+ data.expiresAfterDays = this.siteSettings.invite_expiry_days;
+ }
+
+ return data;
+ }
+
+ get summaryRows() {
+ const rows = [
+ {
+ label: i18n("user.invited.invite_roles.summary.role"),
+ value: this.invite.grants_admin
+ ? i18n("user.invited.invite_roles.summary.role_admin")
+ : i18n("user.invited.invite_roles.summary.role_member"),
+ },
+ {
+ label: i18n("user.invited.invite_roles.summary.method"),
+ value: this.invite.email
+ ? i18n("user.invited.invite_roles.summary.method_email")
+ : i18n("user.invited.invite_roles.summary.method_link"),
+ },
+ ];
+
+ if (this.invite.email || this.invite.domain) {
+ rows.push({
+ label: i18n("user.invited.invite_roles.summary.restriction"),
+ value: this.invite.email || this.invite.domain,
+ });
+ }
+
+ if (!this.invite.email) {
+ rows.push({
+ label: i18n("user.invited.invite_roles.summary.uses"),
+ value: this.invite.max_redemptions_allowed,
+ });
+ }
+
+ if (this.invite.expires_at) {
+ rows.push({
+ label: i18n("user.invited.invite_roles.summary.expires"),
+ value: shortDate(this.invite.expires_at),
+ });
+ }
+
+ if (this.invite.topic) {
+ rows.push({
+ label: i18n("user.invited.invite_roles.summary.topic"),
+ value: this.invite.topic.title,
+ });
+ }
+
+ if (this.invite.groups?.length) {
+ rows.push({
+ label: i18n("user.invited.invite_roles.summary.groups"),
+ value: this.invite.groups.map((g) => g.name).join(", "),
+ });
+ }
+
+ return rows;
+ }
+
+ expiresAtFrom(data) {
+ if (data.expiresAt) {
+ return data.expiresAt;
+ }
+
+ return moment()
+ .add(data.expiresAfterDays, "days")
+ .format(DATE_INPUT_FORMAT);
+ }
+
+ async save(data, nextScreen) {
+ this.saving = true;
+ this.flashText = null;
+
+ try {
+ await this.invite.save(data);
+
+ const invites = this.model?.invites;
+ if (invites && !invites.some((i) => i.id === this.invite.id)) {
+ invites.unshift(this.invite);
+ }
+
+ this.appEvents.trigger("create-invite:saved", this.invite);
+ this.showAdvanced = false;
+ this.screen = nextScreen;
+ } catch (error) {
+ this.flashText = sanitize(extractError(error));
+ this.flashClass = "error";
+ } finally {
+ this.saving = false;
+ }
+ }
+
+ get submitDisabled() {
+ return this.saving || this.submitForcedDisabled;
+ }
+
+ get isLinkCreation() {
+ return !this.inviteCreated && !this.isEmailDelivery;
+ }
+
+ @action
+ onRoleChange(value) {
+ if (this.inviteCreated) {
+ return;
+ }
+ this.role = value;
+ // anything rendered into the admin-mode outlet is torn down on role
+ // change, so its submit lock must not outlive it
+ this.submitForcedDisabled = false;
+ }
+
+ @action
+ setDelivery(value) {
+ this.delivery = value;
+ }
+
+ get emailFieldLabel() {
+ return this.isAdminInvite
+ ? i18n("user.invited.invite_roles.admin_email_label")
+ : i18n("user.invited.invite_roles.member_email_label");
+ }
+
+ @action
+ validateEmail(name, value, { addError }) {
+ if (value && !emailValid(value.trim())) {
+ addError(name, {
+ title: this.emailFieldLabel,
+ message: i18n("user.email.invalid"),
+ });
+ }
+ }
+
+ @action
+ validateDomain(name, value, { addError }) {
+ if (value && !hostnameValid(value.trim())) {
+ addError(name, {
+ title: i18n("user.invited.invite_roles.restrict_domain"),
+ message: i18n("user.invited.invite_roles.domain_invalid"),
+ });
+ }
+ }
+
+ @action
+ async onAdminFormSubmit(data) {
+ const wasCreated = this.inviteCreated;
+ const submitData = {
+ email: data.email?.trim(),
+ description: data.description,
+ custom_message: data.customMessage,
+ expires_at: this.expiresAtFrom(data),
+ };
+
+ if (!wasCreated) {
+ submitData.is_admin = true;
+ }
+
+ await this.save(submitData, SUMMARY);
+ }
+
+ @action
+ async onMemberFormSubmit(data) {
+ const submitData = {
+ description: data.description,
+ group_ids: data.inviteToGroups,
+ topic_id: data.inviteToTopic,
+ expires_at: this.expiresAtFrom(data),
+ };
+
+ let nextScreen = SUMMARY;
+ if (this.delivery === "email") {
+ submitData.email = data.email?.trim();
+ submitData.custom_message = data.customMessage;
+ if (!this.inviteCreated) {
+ nextScreen = EMAIL_SENT;
+ }
+ } else {
+ submitData.domain = data.domain?.trim();
+ submitData.max_redemptions_allowed = data.maxRedemptions;
+ submitData.skip_email = true;
+ }
+
+ await this.save(submitData, nextScreen);
+ }
+
+ @action
+ async submitForm() {
+ if (this.isLinkCreation) {
+ // save and copy in one user gesture so the browser allows the
+ // clipboard write after the network round-trip
+ try {
+ await clipboardCopyAsync(async () => {
+ await this.formApi.submit();
+ if (!this.inviteCreated) {
+ throw new Error("invite was not created");
+ }
+ return new Blob([this.invite.link], { type: "text/plain" });
+ });
+ } catch {
+ // saving errors are surfaced via the form flash; clipboard errors
+ // are recoverable from the summary screen's copy button
+ }
+ } else {
+ await this.formApi.submit();
+ }
+ }
+
+ @action
+ registerApi(api) {
+ this.formApi = api;
+ }
+
+ @action
+ setSubmitDisabled(value) {
+ this.submitForcedDisabled = !!value;
+ }
+
+ @action
+ toggleAdvanced() {
+ this.showAdvanced = !this.showAdvanced;
+ }
+
+ @action
+ onChangeTopic(fieldSet, topicId, topic) {
+ this.topics = [topic];
+ fieldSet(topicId);
+ }
+
+ @action
+ editInvite() {
+ this.cameFromSummary = true;
+ this.screen = FORM;
+ }
+
+ @action
+ cancel() {
+ if (this.cameFromSummary && this.inviteCreated) {
+ this.cameFromSummary = false;
+ this.screen = SUMMARY;
+ } else {
+ this.args.closeModal();
+ }
+ }
+
+ <template>
+ <DModal
+ class="create-invite-with-roles-modal"
+ @title={{this.title}}
+ @closeModal={{@closeModal}}
+ @inline={{@inline}}
+ >
+ <:belowHeader>
+ {{#if this.flashText}}
+ <div id="modal-alert" role="alert" class="alert alert-error">
+ {{trustHTML this.flashText}}
+ </div>
+ {{/if}}
+ </:belowHeader>
+ <:body>
+ {{#if (eq this.screen "form")}}
+ <div class="create-invite-with-roles-modal__role">
+ {{#if this.canInviteAdmins}}
+ <fieldset class="create-invite-with-roles-modal__role-toggle">
+ <legend class="sr-only">
+ {{i18n "user.invited.invite_roles.role_label"}}
+ </legend>
+ {{#each this.roleItems as |item|}}
+ <label
+ class="create-invite-with-roles-modal__role-option
+ {{if (eq this.role item.value) '--active'}}
+ {{if item.disabled '--disabled'}}"
+ >
+ <input
+ type="radio"
+ name="invite-role"
+ value={{item.value}}
+ checked={{eq this.role item.value}}
+ disabled={{item.disabled}}
+ {{on "change" (fn this.onRoleChange item.value)}}
+ />
+ {{dIcon item.icon}}
+ {{item.label}}
+ </label>
+ {{/each}}
+ </fieldset>
+ {{/if}}
+ <p class="create-invite-with-roles-modal__role-description">
+ {{this.roleDescription}}
+ {{#if this.inviteCreated}}
+ <span class="create-invite-with-roles-modal__role-locked">
+ {{i18n "user.invited.invite_roles.role_locked"}}
+ </span>
+ {{/if}}
+ </p>
+ </div>
+
+ {{#if this.isAdminInvite}}
+ <PluginOutlet
+ @name="create-invite-admin-mode"
+ @connectorTagName="div"
+ @outletArgs={{lazyHash
+ invite=this.invite
+ setSubmitDisabled=this.setSubmitDisabled
+ }}
+ />
+
+ <Form
+ @data={{this.adminFormData}}
+ @onSubmit={{this.onAdminFormSubmit}}
+ @onRegisterApi={{this.registerApi}}
+ class="create-invite-with-roles-modal__admin-form"
+ as |form|
+ >
+ <form.Field
+ @name="email"
+ @type="input-email"
+ @title={{this.emailFieldLabel}}
+ @validation="required"
+ @validate={{this.validateEmail}}
+ @format="full"
+ as |field|
+ >
+ <field.Control
+ autofocus="autofocus"
+ autocomplete="off"
+ data-1p-ignore
+ data-lpignore="true"
+ placeholder={{i18n
+ "user.invited.invite_roles.email_placeholder"
+ }}
+ />
+ </form.Field>
+
+ {{#if this.showAdvanced}}
+ <form.Field
+ @name="description"
+ @type="input"
+ @title={{i18n "user.invited.invite.description"}}
+ @description={{i18n "user.invited.invite.description_help"}}
+ @format="full"
+ @validation={{this.descriptionValidation}}
+ as |field|
+ >
+ <field.Control />
+ </form.Field>
+
+ <form.Field
+ @name="customMessage"
+ @type="textarea"
+ @title={{i18n "user.invited.invite.custom_message"}}
+ @description={{i18n
+ "user.invited.invite.custom_message_help"
+ }}
+ @format="full"
+ as |field|
+ >
+ <field.Control
+ height={{100}}
+ placeholder={{i18n
+ "user.invited.invite.custom_message_placeholder"
+ }}
+ />
+ </form.Field>
+
+ <ExpiryField
+ @form={{form}}
+ @created={{this.inviteCreated}}
+ @options={{this.expireAfterOptions}}
+ />
+ {{/if}}
+ </Form>
+ {{else}}
+ <Form
+ @data={{this.memberFormData}}
+ @onSubmit={{this.onMemberFormSubmit}}
+ @onRegisterApi={{this.registerApi}}
+ class="create-invite-with-roles-modal__member-form"
+ as |form|
+ >
+ {{#unless this.inviteCreated}}
+ <fieldset class="create-invite-with-roles-modal__delivery">
+ <legend
+ class="create-invite-with-roles-modal__delivery-label"
+ >{{i18n "user.invited.invite_roles.invite_by"}}</legend>
+ {{#each
+ (array
+ (hash
+ value="link"
+ label=(i18n "user.invited.invite_roles.invite_by_link")
+ )
+ (hash
+ value="email"
+ label=(i18n "user.invited.invite_roles.invite_by_email")
+ )
+ )
+ as |item|
+ }}
+ <label
+ class="create-invite-with-roles-modal__delivery-option"
+ >
+ <input
+ type="radio"
+ name="invite-delivery"
+ value={{item.value}}
+ checked={{eq this.delivery item.value}}
+ {{on "change" (fn this.setDelivery item.value)}}
+ />
+ {{item.label}}
+ </label>
+ {{/each}}
+ </fieldset>
+ {{/unless}}
+
+ {{#if (eq this.delivery "email")}}
+ <form.Field
+ @name="email"
+ @type="input-email"
+ @title={{this.emailFieldLabel}}
+ @description={{i18n
+ "user.invited.invite_roles.member_email_help"
+ }}
+ @validation="required"
+ @validate={{this.validateEmail}}
+ @format="full"
+ @disabled={{this.inviteCreated}}
+ as |field|
+ >
+ <field.Control
+ autocomplete="off"
+ data-1p-ignore
+ data-lpignore="true"
+ placeholder={{i18n
+ "user.invited.invite_roles.email_placeholder"
+ }}
+ />
+ </form.Field>
+ {{else}}
+ <form.Field
+ @name="domain"
+ @type="input"
+ @title={{i18n "user.invited.invite_roles.restrict_domain"}}
+ @description={{i18n
+ "user.invited.invite_roles.restrict_domain_help"
+ }}
+ @validate={{this.validateDomain}}
+ @format="full"
+ as |field|
+ >
+ <field.Control
+ autofocus="autofocus"
+ placeholder={{i18n
+ "user.invited.invite_roles.domain_placeholder"
+ }}
+ />
+ </form.Field>
+ {{/if}}
+
+ {{#if this.showAdvanced}}
+ {{#if (eq this.delivery "email")}}
+ <form.Field
+ @name="customMessage"
+ @type="textarea"
+ @title={{i18n "user.invited.invite.custom_message"}}
+ @description={{i18n
+ "user.invited.invite.custom_message_help"
+ }}
+ @format="full"
+ as |field|
+ >
+ <field.Control
+ height={{100}}
+ placeholder={{i18n
+ "user.invited.invite.custom_message_placeholder"
+ }}
+ />
+ </form.Field>
+ {{else}}
+ <form.Field
+ @name="maxRedemptions"
+ @title={{i18n
+ "user.invited.invite.max_redemptions_allowed"
+ }}
+ @type="input-number"
+ @format="small"
+ @validation="required"
+ as |field|
+ >
+ <field.Control
+ min="1"
+ max={{this.maxRedemptionsAllowedLimit}}
+ />
+ </form.Field>
+ {{/if}}
+
+ <form.Field
+ @name="description"
+ @type="input"
+ @title={{i18n "user.invited.invite.description"}}
+ @description={{i18n "user.invited.invite.description_help"}}
+ @format="full"
+ @validation={{this.descriptionValidation}}
+ as |field|
+ >
+ <field.Control />
+ </form.Field>
+
+ <ExpiryField
+ @form={{form}}
+ @created={{this.inviteCreated}}
+ @options={{this.expireAfterOptions}}
+ />
+
+ {{#if this.canArriveAtTopic}}
+ <form.Field
+ @name="inviteToTopic"
+ @type="custom"
+ @title={{i18n "user.invited.invite.invite_to_topic"}}
+ @description={{i18n
+ "user.invited.invite_roles.arrive_at_topic_help"
+ }}
+ @format="full"
+ as |field|
+ >
+ <field.Control>
+ <TopicChooser
+ @value={{field.value}}
+ @content={{this.topics}}
+ @onChange={{fn this.onChangeTopic field.set}}
+ @options={{hash additionalFilters="status:public"}}
+ />
+ </field.Control>
+ </form.Field>
+ {{/if}}
+
+ {{#if this.canInviteToGroup}}
+ <form.Field
+ @name="inviteToGroups"
+ @type="custom"
+ @title={{i18n "user.invited.invite.add_to_groups"}}
+ @format="full"
+ as |field|
+ >
+ <field.Control>
+ <GroupChooser
+ @content={{this.allGroups}}
+ @value={{field.value}}
+ @labelProperty="name"
+ @onChange={{field.set}}
+ />
+ </field.Control>
+ </form.Field>
+ {{/if}}
+ {{/if}}
+ </Form>
+ {{/if}}
+ {{else if (eq this.screen "summary")}}
+ <div class="create-invite-with-roles-modal__summary">
+ {{#if this.invite.email}}
+ <p class="create-invite-with-roles-modal__sent-to">
+ {{i18n
+ "user.invited.invite_roles.summary.sent_to"
+ email=this.invite.email
+ }}
+ </p>
+ {{/if}}
+
+ <div class="create-invite-with-roles-modal__link-share">
+ <ShareOrCopyInviteLink @invite={{this.invite}} />
+ </div>
+
+ <dl class="create-invite-with-roles-modal__summary-rows">
+ {{#each this.summaryRows as |row|}}
+ <div class="create-invite-with-roles-modal__summary-row">
+ <dt>{{row.label}}</dt>
+ <dd>{{row.value}}</dd>
+ </div>
+ {{/each}}
+ </dl>
+ </div>
+ {{else}}
+ <div class="create-invite-with-roles-modal__email-sent">
+ <p>
+ {{i18n
+ "user.invited.invite_roles.email_sent.body"
+ email=this.invite.email
+ }}
+ </p>
+ </div>
+ {{/if}}
+ </:body>
+ <:footer>
+ {{#if (eq this.screen "form")}}
+ <DButton
+ @icon={{if
+ this.inviteCreated
+ "check"
+ (if this.isEmailDelivery "paper-plane" "copy")
+ }}
+ @translatedLabel={{if
+ this.inviteCreated
+ (i18n "user.invited.invite_roles.update")
+ (if
+ this.isEmailDelivery
+ (i18n "user.invited.invite_roles.create_and_send")
+ (i18n "user.invited.invite_roles.create_and_copy")
+ )
+ }}
+ @action={{this.submitForm}}
+ @disabled={{this.submitDisabled}}
+ class="btn-primary save-invite"
+ />
+ <DButton
+ @label="user.invited.invite.cancel"
+ @action={{this.cancel}}
+ class="btn-transparent cancel-button"
+ />
+ <DButton
+ @icon="gear"
+ @translatedTitle={{if
+ this.showAdvanced
+ (i18n "user.invited.invite_roles.fewer_options")
+ (i18n "user.invited.invite_roles.more_options")
+ }}
+ @action={{this.toggleAdvanced}}
+ class="btn-default toggle-advanced
+ {{if this.showAdvanced '--active'}}"
+ />
+ {{else if (eq this.screen "summary")}}
+ <DButton
+ @translatedLabel={{i18n "user.invited.invite_roles.summary.edit"}}
+ @action={{this.editInvite}}
+ class="btn-default edit-invite"
+ />
+ <LinkTo
+ @route="userInvited.show"
+ @models={{array this.currentUser.username_lower "pending"}}
+ class="btn btn-transparent view-invites"
+ >
+ {{i18n "user.invited.invite_roles.summary.view_invites"}}
+ </LinkTo>
+ {{else}}
+ <LinkTo
+ @route="userInvited.show"
+ @models={{array this.currentUser.username_lower "pending"}}
+ class="btn btn-transparent view-invites"
+ >
+ {{i18n "user.invited.invite_roles.summary.view_invites"}}
+ </LinkTo>
+ {{/if}}
+ </:footer>
+ </DModal>
+ </template>
+}
+
+const ExpiryField = <template>
+ {{#if @created}}
+ <@form.Field
+ @name="expiresAt"
+ @type="custom"
+ @title={{i18n "user.invited.invite.expires_at"}}
+ @format="full"
+ @validation="required"
+ as |field|
+ >
+ <field.Control>
+ <DFutureDateInput
+ @clearable={{true}}
+ @input={{field.value}}
+ @noRelativeOptions={{true}}
+ @onChangeInput={{field.set}}
+ />
+ </field.Control>
+ </@form.Field>
+ {{else}}
+ <@form.Field
+ @name="expiresAfterDays"
+ @type="select"
+ @title={{i18n "user.invited.invite.expires_after"}}
+ @format="full"
+ @validation="required"
+ as |field|
+ >
+ <field.Control as |select|>
+ {{#each @options as |option|}}
+ <select.Option @value={{option.value}}>{{option.text}}</select.Option>
+ {{/each}}
+ </field.Control>
+ </@form.Field>
+ {{/if}}
+</template>;
+
+class ShareOrCopyInviteLink extends Component {
+ @service capabilities;
+
+ @action
+ async nativeShare() {
+ await nativeShare(this.capabilities, { url: this.args.invite.link });
+ }
+
+ <template>
+ <input
+ name="invite-link"
+ type="text"
+ class="invite-link"
+ value={{@invite.link}}
+ readonly={{true}}
+ />
+ {{#if (canNativeShare this.capabilities)}}
+ <DButton
+ class="btn-primary"
+ @icon="share"
+ @translatedLabel={{i18n "user.invited.invite.share_link"}}
+ @action={{this.nativeShare}}
+ />
+ {{else}}
+ <DCopyButton
+ @selector="input.invite-link"
+ @translatedLabel={{i18n "user.invited.invite.copy_link"}}
+ @translatedLabelAfterCopy={{i18n "user.invited.invite.link_copied"}}
+ />
+ {{/if}}
+ </template>
+}
diff --git a/frontend/discourse/app/components/modal/share-topic.gjs b/frontend/discourse/app/components/modal/share-topic.gjs
index 82ac048809c..ae27015f08b 100644
--- a/frontend/discourse/app/components/modal/share-topic.gjs
+++ b/frontend/discourse/app/components/modal/share-topic.gjs
@@ -2,15 +2,14 @@
import Component, { Input } from "@ember/component";
import { action, computed } from "@ember/object";
import { getOwner } from "@ember/owner";
-import { service } from "@ember/service";
import { tagName } from "@ember-decorators/component";
-import CreateInvite from "discourse/components/modal/create-invite";
import PluginOutlet from "discourse/components/plugin-outlet";
import ShareSource from "discourse/components/share-source";
import lazyHash from "discourse/helpers/lazy-hash";
import { afterRender } from "discourse/lib/decorators";
import { longDateNoYear } from "discourse/lib/formatter";
import { getAbsoluteURL } from "discourse/lib/get-url";
+import { showCreateInviteModal } from "discourse/lib/invite-modal";
import Sharing from "discourse/lib/sharing";
import Category from "discourse/models/category";
import DButton from "discourse/ui-kit/d-button";
@@ -20,8 +19,6 @@ import { i18n } from "discourse-i18n";
@tagName("")
export default class ShareTopicModal extends Component {
- @service modal;
-
@computed("model.topic")
get topic() {
return this.model?.topic;
@@ -116,7 +113,7 @@ export default class ShareTopicModal extends Component {
@action
inviteUsers() {
- this.modal.show(CreateInvite, {
+ showCreateInviteModal(this, {
model: {
inviteToTopic: true,
topics: [this.topic],
diff --git a/frontend/discourse/app/controllers/user-invited/show.js b/frontend/discourse/app/controllers/user-invited/show.js
index 93e0987ae6c..b6d4402672e 100644
--- a/frontend/discourse/app/controllers/user-invited/show.js
+++ b/frontend/discourse/app/controllers/user-invited/show.js
@@ -5,12 +5,12 @@ import { action, computed } from "@ember/object";
import { dependentKeyCompat } from "@ember/object/compat";
import { service } from "@ember/service";
import { observes } from "@ember-decorators/object";
-import CreateInvite from "discourse/components/modal/create-invite";
import CreateInviteBulk from "discourse/components/modal/create-invite-bulk";
import { popupAjaxError } from "discourse/lib/ajax-error";
import { removeValueFromArray } from "discourse/lib/array-tools";
import { debounce } from "discourse/lib/decorators";
import { INPUT_DELAY } from "discourse/lib/environment";
+import { showCreateInviteModal } from "discourse/lib/invite-modal";
import Invite from "discourse/models/invite";
import { i18n } from "discourse-i18n";
@@ -116,7 +116,7 @@ export default class UserInvitedShowController extends Controller {
@action
createInvite() {
- this.modal.show(CreateInvite, { model: { invites: this.model.invites } });
+ showCreateInviteModal(this, { model: { invites: this.model.invites } });
}
@action
@@ -126,7 +126,7 @@ export default class UserInvitedShowController extends Controller {
@action
editInvite(invite) {
- this.modal.show(CreateInvite, { model: { editing: true, invite } });
+ showCreateInviteModal(this, { model: { editing: true, invite } });
}
@action
diff --git a/frontend/discourse/app/lib/invite-modal.js b/frontend/discourse/app/lib/invite-modal.js
new file mode 100644
index 00000000000..212c51abb43
--- /dev/null
+++ b/frontend/discourse/app/lib/invite-modal.js
@@ -0,0 +1,23 @@
+import { getOwner } from "@ember/owner";
+import CreateInvite from "discourse/components/modal/create-invite";
+import CreateInviteWithRoles from "discourse/components/modal/create-invite-with-roles";
+
+/**
+ * Opens the invite creation modal, selecting the redesigned role-based
+ * variant when the `enable_invite_modal_with_roles` upcoming change is enabled.
+ *
+ * @param {Object} context - any owned object (component, route, controller)
+ * @param {Object} opts - options forwarded to `modal.show`, e.g. `{ model }`
+ * @returns {Promise} the modal promise from `modal.show`
+ */
+export function showCreateInviteModal(context, opts = {}) {
+ const owner = getOwner(context);
+ const modal = owner.lookup("service:modal");
+ const siteSettings = owner.lookup("service:site-settings");
+
+ const component = siteSettings.enable_invite_modal_with_roles
+ ? CreateInviteWithRoles
+ : CreateInvite;
+
+ return modal.show(component, opts);
+}
diff --git a/frontend/discourse/app/routes/group/index.js b/frontend/discourse/app/routes/group/index.js
index 0c10eb28a2f..10683ae611e 100644
--- a/frontend/discourse/app/routes/group/index.js
+++ b/frontend/discourse/app/routes/group/index.js
@@ -1,7 +1,7 @@
import { action } from "@ember/object";
import { service } from "@ember/service";
-import CreateInvite from "discourse/components/modal/create-invite";
import GroupAddMembersModal from "discourse/components/modal/group-add-members";
+import { showCreateInviteModal } from "discourse/lib/invite-modal";
import DiscourseRoute from "discourse/routes/discourse";
import { i18n } from "discourse-i18n";
@@ -35,7 +35,7 @@ export default class GroupIndex extends DiscourseRoute {
@action
showInviteModal() {
const group = this.modelFor("group");
- this.modal.show(CreateInvite, {
+ showCreateInviteModal(this, {
model: { groupIds: [group.id] },
});
}
diff --git a/frontend/discourse/app/routes/new-invite.js b/frontend/discourse/app/routes/new-invite.js
index c7057b6311a..c7f5bcbaefd 100644
--- a/frontend/discourse/app/routes/new-invite.js
+++ b/frontend/discourse/app/routes/new-invite.js
@@ -1,7 +1,7 @@
import { trackedArray } from "@ember/reactive/collections";
import { next } from "@ember/runloop";
import { service } from "@ember/service";
-import CreateInvite from "discourse/components/modal/create-invite";
+import { showCreateInviteModal } from "discourse/lib/invite-modal";
import { defaultHomepage } from "discourse/lib/utilities";
import DiscourseRoute from "discourse/routes/discourse";
import { i18n } from "discourse-i18n";
@@ -9,7 +9,6 @@ import { i18n } from "discourse-i18n";
export default class extends DiscourseRoute {
@service currentUser;
@service dialog;
- @service modal;
@service router;
async beforeModel(transition) {
@@ -35,7 +34,7 @@ export default class extends DiscourseRoute {
#openInviteModalIfAllowed() {
next(() => {
if (this.currentUser.can_invite_to_forum) {
- this.modal.show(CreateInvite, {
+ showCreateInviteModal(this, {
model: { invites: trackedArray() },
});
} else {
diff --git a/frontend/discourse/tests/acceptance/admin-onboarding-banner-test.gjs b/frontend/discourse/tests/acceptance/admin-onboarding-banner-test.gjs
index 1e0ca594714..0eacca80662 100644
--- a/frontend/discourse/tests/acceptance/admin-onboarding-banner-test.gjs
+++ b/frontend/discourse/tests/acceptance/admin-onboarding-banner-test.gjs
@@ -1,12 +1,32 @@
import { action } from "@ember/object";
import { service } from "@ember/service";
-import { click, settled, visit } from "@ember/test-helpers";
+import { click, fillIn, settled, visit } from "@ember/test-helpers";
import { test } from "qunit";
import StartPostingOption from "discourse/components/admin-onboarding/start-posting-option";
import { AUTO_GROUPS } from "discourse/lib/constants";
import { withPluginApi } from "discourse/lib/plugin-api";
import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+const withStep = (id, assert) => {
+ return {
+ checkbox() {
+ return assert.dom(`div#${id} .onboarding-step__checkbox > svg`);
+ },
+ clickAction() {
+ return click(`div#${id} .onboarding-step__action .btn`);
+ },
+ isChecked() {
+ return this.checkbox().hasClass("checked", `${id} step is completed`);
+ },
+ isNotChecked() {
+ return this.checkbox().doesNotHaveClass(
+ "checked",
+ `${id} step is not completed`
+ );
+ },
+ };
+};
+
acceptance("Admin - Onboarding Banner", function (needs) {
needs.user({
admin: true,
@@ -62,26 +82,6 @@ acceptance("Admin - Onboarding Banner", function (needs) {
});
});
- const withStep = (id, assert) => {
- return {
- checkbox() {
- return assert.dom(`div#${id} .onboarding-step__checkbox > svg`);
- },
- clickAction() {
- return click(`div#${id} .onboarding-step__action .btn`);
- },
- isChecked() {
- return this.checkbox().hasClass("checked", `${id} step is completed`);
- },
- isNotChecked() {
- return this.checkbox().doesNotHaveClass(
- "checked",
- `${id} step is not completed`
- );
- },
- };
- };
-
test("it shows onboarding banner", async function (assert) {
await visit("/");
assert.dom(".admin-onboarding-banner").exists("shows onboarding banner");
@@ -241,6 +241,62 @@ acceptance("Admin - Onboarding Banner", function (needs) {
});
});
+acceptance("Admin - Onboarding Banner - admin invites", function (needs) {
+ needs.user({
+ admin: true,
+ groups: [AUTO_GROUPS.admins],
+ show_site_owner_onboarding: true,
+ can_create_admin_invite: true,
+ });
+
+ needs.settings({
+ enable_site_owner_onboarding: true,
+ enable_invite_modal_with_roles: true,
+ });
+
+ needs.pretender((server, helper) => {
+ server.put("/admin/site_settings/enable_site_owner_onboarding", () => {
+ return helper.response(200, { success: "OK" });
+ });
+
+ server.post("/invites", () => {
+ return helper.response(200, {
+ id: 42,
+ invite_key: "abc123",
+ link: "http://example.com/invites/abc123",
+ email: "[email protected]",
+ grants_admin: true,
+ expires_at: "2100-01-01 00:00",
+ });
+ });
+ });
+
+ test("the invite step opens the role-based modal defaulted to admins and completes", async function (assert) {
+ const step = withStep("invite_collaborators", assert);
+ await visit("/");
+
+ step.isNotChecked();
+
+ await step.clickAction();
+
+ assert
+ .dom(".create-invite-with-roles-modal")
+ .exists("opens the role-based invite modal");
+ assert
+ .dom(".create-invite-with-roles-modal__role-toggle input[value='admin']")
+ .isChecked("defaults to the admins tab");
+
+ await fillIn(
+ ".create-invite-with-roles-modal input[name='email']",
+ );
+ await click(".create-invite-with-roles-modal .save-invite");
+ await click(".modal-close");
+
+ step.isChecked();
+ });
+});
+
acceptance("Admin - Onboarding Banner - non admin user", function (needs) {
needs.user({ admin: false });
needs.settings({
diff --git a/frontend/discourse/tests/integration/components/create-invite-with-roles-test.gjs b/frontend/discourse/tests/integration/components/create-invite-with-roles-test.gjs
new file mode 100644
index 00000000000..54343fc0bff
--- /dev/null
+++ b/frontend/discourse/tests/integration/components/create-invite-with-roles-test.gjs
@@ -0,0 +1,296 @@
+import { fn } from "@ember/helper";
+import { on } from "@ember/modifier";
+import { click, render } from "@ember/test-helpers";
+import { module, test } from "qunit";
+import CreateInviteWithRoles from "discourse/components/modal/create-invite-with-roles";
+import { withPluginApi } from "discourse/lib/plugin-api";
+import Invite from "discourse/models/invite";
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import pretender, { response } from "discourse/tests/helpers/create-pretender";
+import formKit from "discourse/tests/helpers/form-kit-helper";
+
+module("Integration | Component | CreateInviteWithRoles", function (hooks) {
+ setupRenderingTest(hooks);
+
+ test("hides the role toggle for users who can't create admin invites", async function (assert) {
+ const model = {};
+
+ await render(
+ <template>
+ <CreateInviteWithRoles @inline={{true}} @model={{model}} />
+ </template>
+ );
+
+ assert
+ .dom(".create-invite-with-roles-modal__role-toggle")
+ .doesNotExist("role toggle is not shown");
+ assert.true(formKit().hasField("domain"), "defaults to member link mode");
+ });
+
+ test("shows the role toggle when the user can create admin invites", async function (assert) {
+ this.currentUser.set("can_create_admin_invite", true);
+ const model = {};
+
+ await render(
+ <template>
+ <CreateInviteWithRoles @inline={{true}} @model={{model}} />
+ </template>
+ );
+
+ assert.dom(".create-invite-with-roles-modal__role-toggle").exists();
+ assert
+ .dom(".create-invite-with-roles-modal__role-toggle input[value='member']")
+ .isChecked("defaults to the members tab");
+ });
+
+ test("defaults to the admins tab when the model asks for it", async function (assert) {
+ this.currentUser.set("can_create_admin_invite", true);
+ const model = { defaultRole: "admin" };
+
+ await render(
+ <template>
+ <CreateInviteWithRoles @inline={{true}} @model={{model}} />
+ </template>
+ );
+
+ assert
+ .dom(".create-invite-with-roles-modal__role-toggle input[value='admin']")
+ .isChecked("defaults to the admins tab");
+ assert.true(formKit().hasField("email"), "shows the email field");
+ assert.false(
+ formKit().hasField("domain"),
+ "does not show the domain field"
+ );
+ assert.dom(".save-invite").hasText("Create & send");
+ });
+
+ test("ignores defaultRole for users who can't create admin invites", async function (assert) {
+ const model = { defaultRole: "admin" };
+
+ await render(
+ <template>
+ <CreateInviteWithRoles @inline={{true}} @model={{model}} />
+ </template>
+ );
+
+ assert.true(formKit().hasField("domain"), "stays in member mode");
+ });
+
+ test("creating an admin invite posts is_admin and shows the summary", async function (assert) {
+ this.currentUser.set("can_create_admin_invite", true);
+ const model = { defaultRole: "admin", invites: [] };
+
+ let requestBody;
+ pretender.post("/invites", (request) => {
+ requestBody = new URLSearchParams(request.requestBody);
+ return response({
+ id: 42,
+ invite_key: "abc123",
+ link: "http://example.com/invites/abc123",
+ email: "[email protected]",
+ grants_admin: true,
+ expires_at: "2100-01-01 00:00",
+ });
+ });
+
+ let savedEventInvite;
+ this.owner
+ .lookup("service:app-events")
+ .on("create-invite:saved", (invite) => (savedEventInvite = invite));
+
+ await render(
+ <template>
+ <CreateInviteWithRoles @inline={{true}} @model={{model}} />
+ </template>
+ );
+
+ await formKit().field("email").fillIn("[email protected]");
+ await click(".save-invite");
+
+ assert.strictEqual(requestBody.get("is_admin"), "true");
+ assert.strictEqual(requestBody.get("email"), "[email protected]");
+
+ assert
+ .dom(".create-invite-with-roles-modal__sent-to")
+ .includesText("[email protected]");
+ assert
+ .dom(".create-invite-with-roles-modal__link-share input.invite-link")
+ .hasValue("http://example.com/invites/abc123");
+
+ assert.strictEqual(model.invites.length, 1, "invite added to the list");
+ assert.strictEqual(
+ savedEventInvite?.id,
+ 42,
+ "create-invite:saved app event fired"
+ );
+ });
+
+ test("validates the admin email address", async function (assert) {
+ this.currentUser.set("can_create_admin_invite", true);
+ const model = { defaultRole: "admin" };
+
+ await render(
+ <template>
+ <CreateInviteWithRoles @inline={{true}} @model={{model}} />
+ </template>
+ );
+
+ await formKit().field("email").fillIn("not-an-email");
+ await click(".save-invite");
+
+ assert.dom(".form-kit__errors").exists("shows a validation error");
+ });
+
+ test("creating a member link invite posts skip_email and shows the summary", async function (assert) {
+ const model = { invites: [] };
+
+ let requestBody;
+ pretender.post("/invites", (request) => {
+ requestBody = new URLSearchParams(request.requestBody);
+ return response({
+ id: 43,
+ invite_key: "def456",
+ link: "http://example.com/invites/def456",
+ max_redemptions_allowed: 10,
+ expires_at: "2100-01-01 00:00",
+ });
+ });
+
+ await render(
+ <template>
+ <CreateInviteWithRoles @inline={{true}} @model={{model}} />
+ </template>
+ );
+
+ await click(".save-invite");
+
+ assert.strictEqual(requestBody.get("skip_email"), "true");
+ assert.notStrictEqual(requestBody.get("max_redemptions_allowed"), null);
+ assert.strictEqual(requestBody.get("is_admin"), null);
+
+ assert
+ .dom(".create-invite-with-roles-modal__link-share input.invite-link")
+ .hasValue("http://example.com/invites/def456");
+ });
+
+ test("sends the topic supplied by the model, like when sharing a topic", async function (assert) {
+ const model = {
+ inviteToTopic: true,
+ topics: [{ id: 123, title: "A very interesting discussion" }],
+ topicId: 123,
+ topicTitle: "A very interesting discussion",
+ };
+
+ let requestBody;
+ pretender.post("/invites", (request) => {
+ requestBody = new URLSearchParams(request.requestBody);
+ return response({
+ id: 46,
+ invite_key: "mno345",
+ link: "http://example.com/invites/mno345",
+ max_redemptions_allowed: 10,
+ expires_at: "2100-01-01 00:00",
+ });
+ });
+
+ await render(
+ <template>
+ <CreateInviteWithRoles @inline={{true}} @model={{model}} />
+ </template>
+ );
+
+ await click(".save-invite");
+
+ assert.strictEqual(requestBody.get("topic_id"), "123");
+ });
+
+ test("creating a member email invite shows the invitation sent screen", async function (assert) {
+ const model = { invites: [] };
+
+ pretender.post("/invites", () =>
+ response({
+ id: 44,
+ invite_key: "ghi789",
+ link: "http://example.com/invites/ghi789",
+ email: "[email protected]",
+ expires_at: "2100-01-01 00:00",
+ })
+ );
+
+ await render(
+ <template>
+ <CreateInviteWithRoles @inline={{true}} @model={{model}} />
+ </template>
+ );
+
+ await click(
+ ".create-invite-with-roles-modal__delivery input[value='email']"
+ );
+ await formKit().field("email").fillIn("[email protected]");
+ await click(".save-invite");
+
+ assert
+ .dom(".create-invite-with-roles-modal__email-sent")
+ .includesText("[email protected]");
+ assert
+ .dom(".create-invite-with-roles-modal__link-share")
+ .doesNotExist("no copy link UI for email invites");
+ });
+
+ test("editing an existing admin invite locks the role toggle", async function (assert) {
+ this.currentUser.set("can_create_admin_invite", true);
+ const invite = Invite.create({
+ id: 45,
+ invite_key: "jkl012",
+ link: "http://example.com/invites/jkl012",
+ email: "[email protected]",
+ grants_admin: true,
+ expires_at: "2100-01-01 00:00",
+ });
+ const model = { editing: true, invite };
+
+ await render(
+ <template>
+ <CreateInviteWithRoles @inline={{true}} @model={{model}} />
+ </template>
+ );
+
+ assert
+ .dom(".create-invite-with-roles-modal__role-toggle input[value='admin']")
+ .isChecked("admin tab selected");
+ assert
+ .dom(".create-invite-with-roles-modal__role-toggle input[value='member']")
+ .isDisabled("member tab is locked");
+ assert.dom(".save-invite").hasText("Update");
+ });
+
+ test("plugin outlet can disable the submit button in admin mode", async function (assert) {
+ this.currentUser.set("can_create_admin_invite", true);
+ const model = { defaultRole: "admin" };
+
+ withPluginApi((api) => {
+ api.renderInOutlet(
+ "create-invite-admin-mode",
+ <template>
+ <button
+ type="button"
+ class="test-disable-submit"
+ {{on "click" (fn @outletArgs.setSubmitDisabled true)}}
+ >disable</button>
+ </template>
+ );
+ });
+
+ await render(
+ <template>
+ <CreateInviteWithRoles @inline={{true}} @model={{model}} />
+ </template>
+ );
+
+ assert.dom(".save-invite").isNotDisabled();
+
+ await click(".test-disable-submit");
+
+ assert.dom(".save-invite").isDisabled();
+ });
+});
diff --git a/lib/guardian/invite_guardian.rb b/lib/guardian/invite_guardian.rb
index f077adbd47d..2c7e5651c5f 100644
--- a/lib/guardian/invite_guardian.rb
+++ b/lib/guardian/invite_guardian.rb
@@ -9,6 +9,10 @@ module InviteGuardian
is_staff? || is_me?(user)
end
+ def can_create_admin_invite?
+ is_admin? && @user.upcoming_change_enabled?(:enable_invite_modal_with_roles)
+ end
+
def can_invite_to_forum?(groups = nil)
return false if !authenticated?
return false if [email protected]_any_groups?(SiteSetting.invite_allowed_groups_map)
diff --git a/public/images/upcoming_changes/enable_invite_modal_with_roles.png b/public/images/upcoming_changes/enable_invite_modal_with_roles.png
new file mode 100644
index 00000000000..0abb6e724e6
Binary files /dev/null and b/public/images/upcoming_changes/enable_invite_modal_with_roles.png differ
diff --git a/spec/lib/guardian/invite_guardian_spec.rb b/spec/lib/guardian/invite_guardian_spec.rb
index 1169ff4cb49..c25b45c7883 100644
--- a/spec/lib/guardian/invite_guardian_spec.rb
+++ b/spec/lib/guardian/invite_guardian_spec.rb
@@ -45,6 +45,23 @@ RSpec.describe InviteGuardian do
###### INVITING ######
+ describe "#can_create_admin_invite?" do
+ it "is true only for admins when enable_invite_modal_with_roles is enabled" do
+ SiteSetting.enable_invite_modal_with_roles = true
+
+ expect(Guardian.new(admin).can_create_admin_invite?).to eq(true)
+ expect(Guardian.new(moderator).can_create_admin_invite?).to eq(false)
+ expect(Guardian.new(user).can_create_admin_invite?).to eq(false)
+ expect(Guardian.new(nil).can_create_admin_invite?).to eq(false)
+ end
+
+ it "is false for admins when enable_invite_modal_with_roles is disabled" do
+ SiteSetting.enable_invite_modal_with_roles = false
+
+ expect(Guardian.new(admin).can_create_admin_invite?).to eq(false)
+ end
+ end
+
describe "#can_invite_to_forum?" do
it "returns true if user has sufficient trust level" do
SiteSetting.invite_allowed_groups = Group::AUTO_GROUPS[:trust_level_2]
diff --git a/spec/models/invite_redeemer_spec.rb b/spec/models/invite_redeemer_spec.rb
index 2bfd5c57800..905c751a631 100644
--- a/spec/models/invite_redeemer_spec.rb
+++ b/spec/models/invite_redeemer_spec.rb
@@ -664,5 +664,70 @@ RSpec.describe InviteRedeemer do
end
end
end
+
+ context "with an admin invite" do
+ fab!(:invite) do
+ Fabricate(:invite, email: "[email protected]", admin: true, invited_by: admin)
+ end
+
+ before { SiteSetting.enable_invite_modal_with_roles = true }
+
+ def redeem
+ InviteRedeemer.new(
+ invite: invite,
+ email: invite.email,
+ username: "futureadmin",
+ name: "Future Admin",
+ ).redeem
+ end
+
+ it "grants moderator and asks the inviter to confirm the admin grant" do
+ user = redeem
+
+ expect(user.moderator).to eq(true)
+ expect(user.admin).to eq(false)
+ expect(AdminConfirmation.exists_for?(user.id)).to eq(true)
+ expect(
+ job_enqueued?(job: :admin_confirmation_email, args: { to_address: admin.email }),
+ ).to eq(true)
+ end
+
+ it "grants admin once the inviter confirms via email" do
+ user = redeem
+
+ token = Discourse.redis.get("admin-confirmation:#{user.id}")
+ AdminConfirmation.find_by_code(token).email_confirmed!
+
+ expect(user.reload.admin).to eq(true)
+ end
+
+ it "grants moderator and sends the confirmation when an existing user redeems" do
+ existing_user = Fabricate(:user, email: invite.email)
+
+ InviteRedeemer.new(invite: invite, redeeming_user: existing_user).redeem
+
+ expect(existing_user.reload.moderator).to eq(true)
+ expect(AdminConfirmation.exists_for?(existing_user.id)).to eq(true)
+ end
+
+ it "redeems as a regular invite when the inviter is no longer an admin" do
+ invite.invited_by.update!(admin: false)
+
+ user = redeem
+
+ expect(user.moderator).to eq(false)
+ expect(user.admin).to eq(false)
+ expect(AdminConfirmation.exists_for?(user.id)).to eq(false)
+ end
+
+ it "redeems as a regular invite when enable_invite_modal_with_roles is disabled" do
+ SiteSetting.enable_invite_modal_with_roles = false
+
+ user = redeem
+
+ expect(user.moderator).to eq(false)
+ expect(AdminConfirmation.exists_for?(user.id)).to eq(false)
+ end
+ end
end
end
diff --git a/spec/models/invite_spec.rb b/spec/models/invite_spec.rb
index 7f2a4f8e66c..dc4223c7c71 100644
--- a/spec/models/invite_spec.rb
+++ b/spec/models/invite_spec.rb
@@ -253,6 +253,81 @@ RSpec.describe Invite do
end
end
end
+
+ context "with admin invites" do
+ fab!(:admin)
+
+ it "creates a single-use email invite" do
+ invite = Invite.generate(admin, email: "[email protected]", admin: true)
+
+ expect(invite.admin).to eq(true)
+ expect(invite.max_redemptions_allowed).to eq(1)
+ end
+
+ it "requires an email address" do
+ expect { Invite.generate(admin, admin: true) }.to raise_error(
+ ActiveRecord::RecordInvalid,
+ /#{I18n.t("invite.admin_invite_requires_email")}/,
+ )
+ end
+
+ it "requires the inviter to be an admin" do
+ expect { Invite.generate(user, email: "[email protected]", admin: true) }.to raise_error(
+ ActiveRecord::RecordInvalid,
+ /#{I18n.t("invite.admin_invite_requires_admin_inviter")}/,
+ )
+ end
+
+ it "cannot be combined with a domain restriction" do
+ invite = Fabricate.build(:invite, email: nil, domain: "example.com", admin: true)
+ expect(invite).not_to be_valid
+ end
+
+ it "triggers an event when created" do
+ events =
+ DiscourseEvent.track_events(:admin_invite_created) do
+ Invite.generate(admin, email: "[email protected]", admin: true)
+ end
+
+ expect(events.first[:params].first.email).to eq("[email protected]")
+ end
+
+ it "clears the admin flag when the invite is reused without it" do
+ invite = Invite.generate(admin, email: "[email protected]", admin: true)
+ reused = Invite.generate(admin, email: "[email protected]")
+
+ expect(reused.id).to eq(invite.id)
+ expect(reused.admin).to eq(false)
+ end
+
+ it "keeps the admin flag when the invite is reused with it" do
+ invite = Invite.generate(admin, email: "[email protected]", admin: true)
+ reused = Invite.generate(admin, email: "[email protected]", admin: true)
+
+ expect(reused.id).to eq(invite.id)
+ expect(reused.admin).to eq(true)
+ end
+
+ it "clears topic and group associations when a member invite is reused as an admin invite" do
+ topic = Fabricate(:topic)
+ group = Fabricate(:group)
+ invite =
+ Invite.generate(
+ admin,
+ email: "[email protected]",
+ topic_id: topic.id,
+ group_ids: [group.id],
+ )
+ expect(invite.topics).to contain_exactly(topic)
+ expect(invite.groups).to contain_exactly(group)
+
+ reused = Invite.generate(admin, email: "[email protected]", admin: true)
+
+ expect(reused.id).to eq(invite.id)
+ expect(reused.topics).to be_empty
+ expect(reused.groups).to be_empty
+ end
+ end
end
describe "#redeem" do
diff --git a/spec/requests/api/schemas/json/invite_create_response.json b/spec/requests/api/schemas/json/invite_create_response.json
index 26914b77d05..6e91890399d 100644
--- a/spec/requests/api/schemas/json/invite_create_response.json
+++ b/spec/requests/api/schemas/json/invite_create_response.json
@@ -59,6 +59,10 @@
"type": "boolean",
"example": false
},
+ "grants_admin": {
+ "type": "boolean",
+ "example": false
+ },
"topics": {
"type": "array",
"items": {
@@ -88,6 +92,7 @@
"updated_at",
"expires_at",
"expired",
+ "grants_admin",
"topics",
"groups"
]
diff --git a/spec/requests/invites_controller_spec.rb b/spec/requests/invites_controller_spec.rb
index 808c5c97b34..e30fad97b6e 100644
--- a/spec/requests/invites_controller_spec.rb
+++ b/spec/requests/invites_controller_spec.rb
@@ -631,6 +631,152 @@ RSpec.describe InvitesController do
end
end
+ context "with admin invite" do
+ before { SiteSetting.enable_invite_modal_with_roles = true }
+
+ it "creates a single-use admin invite" do
+ sign_in(admin)
+
+ post "/invites.json", params: { email: "[email protected]", is_admin: "true" }
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body["grants_admin"]).to eq(true)
+
+ invite = Invite.last
+ expect(invite.admin).to eq(true)
+ expect(invite.email).to eq("[email protected]")
+ expect(invite.max_redemptions_allowed).to eq(1)
+ end
+
+ it "ignores the max_redemptions_allowed parameter" do
+ sign_in(admin)
+
+ post "/invites.json",
+ params: {
+ email: "[email protected]",
+ is_admin: "true",
+ max_redemptions_allowed: 10,
+ }
+
+ expect(response.status).to eq(200)
+ expect(Invite.last.max_redemptions_allowed).to eq(1)
+ end
+
+ it "fails when enable_invite_modal_with_roles is disabled" do
+ SiteSetting.enable_invite_modal_with_roles = false
+ sign_in(admin)
+
+ post "/invites.json", params: { email: "[email protected]", is_admin: "true" }
+ expect(response.status).to eq(403)
+ end
+
+ it "fails for moderators and regular users" do
+ sign_in(Fabricate(:moderator))
+ post "/invites.json", params: { email: "[email protected]", is_admin: "true" }
+ expect(response.status).to eq(403)
+
+ sign_in(user)
+ post "/invites.json", params: { email: "[email protected]", is_admin: "true" }
+ expect(response.status).to eq(403)
+ end
+
+ it "fails when combined with a topic, groups or a domain" do
+ sign_in(admin)
+ topic = Fabricate(:topic)
+ group = Fabricate(:group)
+
+ post "/invites.json",
+ params: {
+ email: "[email protected]",
+ is_admin: "true",
+ topic_id: topic.id,
+ }
+ expect(response.status).to eq(400)
+
+ post "/invites.json",
+ params: {
+ email: "[email protected]",
+ is_admin: "true",
+ group_ids: [group.id],
+ }
+ expect(response.status).to eq(400)
+
+ post "/invites.json", params: { is_admin: "true", domain: "example.com" }
+ expect(response.status).to eq(400)
+ end
+
+ it "cannot escalate an existing member invite to admin via #update" do
+ sign_in(admin)
+ invite = Fabricate(:invite, invited_by: admin, email: "[email protected]")
+
+ put "/invites/#{invite.id}", params: { is_admin: "true", admin: "true" }
+
+ expect(response.status).to eq(200)
+ expect(invite.reload.admin).to eq(false)
+ end
+
+ it "does not create admin invites via bulk create" do
+ sign_in(admin)
+
+ post "/invites/create-multiple.json",
+ params: {
+ is_admin: "true",
+ }
+
+ expect(response.status).to eq(200)
+ expect(Invite.where(email: %w[[email protected] [email protected]]).pluck(:admin)).to eq(
+ [false, false],
+ )
+ end
+
+ it "cannot add a topic or groups to an admin invite via #update" do
+ sign_in(admin)
+ topic = Fabricate(:topic)
+ group = Fabricate(:group)
+
+ post "/invites.json", params: { email: "[email protected]", is_admin: "true" }
+ expect(response.status).to eq(200)
+ invite = Invite.last
+
+ put "/invites/#{invite.id}", params: { topic_id: topic.id }
+ expect(response.status).to eq(400)
+
+ put "/invites/#{invite.id}", params: { group_ids: [group.id] }
+ expect(response.status).to eq(400)
+
+ expect(invite.reload.topics).to be_empty
+ expect(invite.groups).to be_empty
+ end
+
+ it "cannot strip the email from an admin invite via #update" do
+ sign_in(admin)
+
+ post "/invites.json", params: { email: "[email protected]", is_admin: "true" }
+ expect(response.status).to eq(200)
+ invite = Invite.last
+
+ put "/invites/#{invite.id}", params: { domain: "example.com" }
+
+ expect(response.status).to eq(422)
+ expect(invite.reload.email).to eq("[email protected]")
+ expect(invite.admin).to eq(true)
+ end
+
+ it "is rate limited" do
+ sign_in(admin)
+ RateLimiter.enable
+
+ 10.times do |i|
+ post "/invites.json", params: { email: "test#{i}@example.com", is_admin: "true" }
+ expect(response.status).to eq(200)
+ end
+
+ post "/invites.json", params: { email: "[email protected]", is_admin: "true" }
+ expect(response.status).to eq(429)
+ end
+ end
+
context "with link invite" do
it "works" do
sign_in(admin)
diff --git a/spec/serializers/current_user_serializer_spec.rb b/spec/serializers/current_user_serializer_spec.rb
index f7da46d3ffe..67ee4a19fbf 100644
--- a/spec/serializers/current_user_serializer_spec.rb
+++ b/spec/serializers/current_user_serializer_spec.rb
@@ -147,6 +147,30 @@ RSpec.describe CurrentUserSerializer do
end
end
+ describe "#can_create_admin_invite" do
+ let(:payload) { serializer.as_json }
+
+ it "is true for admins when enable_invite_modal_with_roles is enabled" do
+ SiteSetting.enable_invite_modal_with_roles = true
+ user.update!(admin: true)
+
+ expect(payload[:can_create_admin_invite]).to eq(true)
+ end
+
+ it "is absent for admins when enable_invite_modal_with_roles is disabled" do
+ SiteSetting.enable_invite_modal_with_roles = false
+ user.update!(admin: true)
+
+ expect(payload).not_to have_key(:can_create_admin_invite)
+ end
+
+ it "is absent for regular users when enable_invite_modal_with_roles is enabled" do
+ SiteSetting.enable_invite_modal_with_roles = true
+
+ expect(payload).not_to have_key(:can_create_admin_invite)
+ end
+ end
+
describe "#can_review" do
let(:guardian) { user.guardian }
let(:payload) { serializer.as_json }
diff --git a/spec/system/create_invite_with_roles_spec.rb b/spec/system/create_invite_with_roles_spec.rb
new file mode 100644
index 00000000000..fa0920c87c3
--- /dev/null
+++ b/spec/system/create_invite_with_roles_spec.rb
@@ -0,0 +1,190 @@
+# frozen_string_literal: true
+
+describe "Creating invites with roles" do
+ include ThemeScreenshotMarker
+
+ fab!(:admin)
+ fab!(:group)
+ fab!(:user) { Fabricate(:user, groups: [group]) }
+
+ let(:user_invited_pending_page) { PageObjects::Pages::UserInvitedPending.new }
+ let(:modal) { PageObjects::Modals::CreateInviteWithRoles.new }
+ let(:invite_form) { PageObjects::Pages::InviteForm.new }
+ let(:cdp) { PageObjects::CDP.new }
+
+ before { SiteSetting.enable_invite_modal_with_roles = true }
+
+ def open_invite_modal_for(current_user)
+ user_invited_pending_page.visit(current_user)
+ find(".user-invite-buttons .btn", match: :first).click
+ end
+
+ context "when signed in as an admin" do
+ fab!(:placeholder_invite) do
+ Fabricate(:invite, invited_by: admin, email: "[email protected]")
+ end
+
+ before { sign_in(admin) }
+
+ it "can create an admin invite and redeem it end to end" do
+ open_invite_modal_for(admin)
+
+ expect(modal).to be_open
+ expect(modal).to have_role_toggle
+ expect(modal.selected_role).to eq("member")
+
+ modal.select_role("admin")
+ screenshot_marker(label: "invite-admins", only: :desktop)
+
+ modal.toggle_advanced_options
+ screenshot_marker(label: "invite-admins-advanced", only: :desktop)
+ modal.toggle_advanced_options
+
+ modal.form.field("email").fill_in("[email protected]")
+ modal.save_button.click
+
+ expect(modal).to have_sent_to_message("[email protected]")
+ expect(modal).to have_summary
+ screenshot_marker(label: "invite-admin-sent", only: :desktop)
+
+ invite = Invite.last
+ expect(invite.admin).to eq(true)
+ expect(invite.email).to eq("[email protected]")
+ expect(invite.max_redemptions_allowed).to eq(1)
+ expect(modal.invite_link_input.value).to eq(invite.link)
+
+ modal.close
+ Capybara.reset_sessions!
+
+ invite_form.open(invite.invite_key)
+ invite_form.fill_username("futureadmin")
+ invite_form.fill_password("supersecurepassword")
+ expect(invite_form).to have_valid_fields
+ invite_form.click_create_account
+ expect(invite_form).to have_successful_message
+
+ invited_user = User.find_by_username("futureadmin")
+ expect(invited_user.moderator).to eq(true)
+ expect(invited_user.admin).to eq(false)
+ expect(AdminConfirmation.exists_for?(invited_user.id)).to eq(true)
+
+ token = Discourse.redis.get("admin-confirmation:#{invited_user.id}")
+ AdminConfirmation.find_by_code(token).email_confirmed!
+ expect(invited_user.reload.admin).to eq(true)
+ end
+
+ it "marks the invite step complete via the create-invite:saved event when inviting an admin" do
+ SiteSetting.enable_site_owner_onboarding = true
+ banner = PageObjects::Components::AdminOnboardingBanner.new
+
+ visit("/")
+ expect(banner.step_not_completed?("invite_collaborators")).to eq(true)
+ screenshot_marker(label: "invite-onboarding-banner", only: :desktop)
+
+ banner.click_step_action("invite_collaborators")
+ expect(modal).to be_open
+ expect(modal.selected_role).to eq("admin")
+
+ modal.form.field("email").fill_in("[email protected]")
+ modal.save_button.click
+ expect(modal).to have_summary
+ modal.close
+
+ expect(banner.step_completed?("invite_collaborators")).to eq(true)
+ end
+
+ it "can create a member link invite with a domain restriction" do
+ cdp.allow_clipboard
+
+ open_invite_modal_for(admin)
+
+ expect(modal.selected_role).to eq("member")
+ screenshot_marker(label: "invite-members", only: :desktop)
+
+ modal.toggle_advanced_options
+ screenshot_marker(label: "invite-members-advanced", only: :desktop)
+ modal.toggle_advanced_options
+
+ modal.form.field("domain").fill_in("example.com")
+ modal.save_button.click
+
+ expect(modal).to have_summary
+ screenshot_marker(label: "invite-created", only: :desktop)
+
+ invite = Invite.last
+ expect(invite.admin).to eq(false)
+ expect(invite.domain).to eq("example.com")
+ cdp.clipboard_has_text?(invite.link)
+ end
+
+ it "can create a member email invite" do
+ open_invite_modal_for(admin)
+
+ modal.select_delivery("email")
+ modal.form.field("email").fill_in("[email protected]")
+ screenshot_marker(label: "invite-members-email", only: :desktop)
+ modal.save_button.click
+
+ expect(modal).to have_email_sent_confirmation("[email protected]")
+ screenshot_marker(label: "invite-email-sent", only: :desktop)
+
+ invite = Invite.last
+ expect(invite.admin).to eq(false)
+ expect(invite.email).to eq("[email protected]")
+ end
+
+ it "locks the role when editing an invite from the summary" do
+ open_invite_modal_for(admin)
+
+ modal.select_role("admin")
+ modal.form.field("email").fill_in("[email protected]")
+ modal.save_button.click
+ expect(modal).to have_summary
+
+ modal.edit_button.click
+
+ expect(modal.selected_role).to eq("admin")
+ expect(modal.role_option_disabled?("member")).to eq(true)
+ expect(modal.save_button).to have_text(I18n.t("js.user.invited.invite_roles.update"))
+
+ modal.cancel_button.click
+ expect(modal).to have_summary
+ end
+ end
+
+ context "when signed in as a regular user who can invite" do
+ fab!(:placeholder_invite) do
+ Fabricate(:invite, invited_by: user, email: "[email protected]")
+ end
+
+ before do
+ SiteSetting.invite_allowed_groups = group.id.to_s
+ sign_in(user)
+ end
+
+ it "does not offer the admins option" do
+ open_invite_modal_for(user)
+
+ expect(modal).to be_open
+ expect(modal).to have_no_role_toggle
+ end
+ end
+
+ context "when enable_invite_modal_with_roles is disabled" do
+ fab!(:placeholder_invite) do
+ Fabricate(:invite, invited_by: admin, email: "[email protected]")
+ end
+
+ before do
+ SiteSetting.enable_invite_modal_with_roles = false
+ sign_in(admin)
+ end
+
+ it "shows the previous invite modal" do
+ open_invite_modal_for(admin)
+
+ expect(page).to have_css(".create-invite-modal")
+ expect(page).to have_no_css(".create-invite-with-roles-modal")
+ end
+ end
+end
diff --git a/spec/system/page_objects/modals/create_invite_with_roles.rb b/spec/system/page_objects/modals/create_invite_with_roles.rb
new file mode 100644
index 00000000000..29d5aeb79d1
--- /dev/null
+++ b/spec/system/page_objects/modals/create_invite_with_roles.rb
@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+module PageObjects
+ module Modals
+ class CreateInviteWithRoles < PageObjects::Modals::Base
+ MODAL_SELECTOR = ".create-invite-with-roles-modal"
+
+ def modal
+ find(MODAL_SELECTOR)
+ end
+
+ def open?
+ has_css?(MODAL_SELECTOR)
+ end
+
+ def closed?
+ has_no_css?(MODAL_SELECTOR)
+ end
+
+ def form
+ PageObjects::Components::FormKit.new("#{MODAL_SELECTOR} .form-kit")
+ end
+
+ def has_role_toggle?
+ within(modal) { has_css?(".create-invite-with-roles-modal__role-toggle") }
+ end
+
+ def has_no_role_toggle?
+ within(modal) { has_no_css?(".create-invite-with-roles-modal__role-toggle") }
+ end
+
+ def selected_role
+ within(modal) do
+ find(".create-invite-with-roles-modal__role-toggle input:checked", visible: false)[:value]
+ end
+ end
+
+ def select_role(role)
+ within(modal) do
+ find(
+ ".create-invite-with-roles-modal__role-toggle input[value='#{role}']",
+ visible: false,
+ ).ancestor("label").click
+ end
+ end
+
+ def role_option_disabled?(role)
+ within(modal) do
+ find(
+ ".create-invite-with-roles-modal__role-toggle input[value='#{role}']",
+ visible: false,
+ ).disabled?
+ end
+ end
+
+ def select_delivery(delivery)
+ within(modal) do
+ find(
+ ".create-invite-with-roles-modal__delivery input[value='#{delivery}']",
+ visible: false,
+ ).ancestor("label").click
+ end
+ end
+
+ def save_button
+ within(modal) { find(".save-invite") }
+ end
+
+ def toggle_advanced_options
+ within(modal) { find(".toggle-advanced").click }
+ end
+
+ def edit_button
+ within(modal) { find(".edit-invite") }
+ end
+
+ def cancel_button
+ within(modal) { find(".cancel-button") }
+ end
+
+ def invite_link_input
+ within(modal) { find("input.invite-link") }
+ end
+
+ def has_summary?
+ within(modal) { has_css?(".create-invite-with-roles-modal__summary") }
+ end
+
+ def has_sent_to_message?(email)
+ within(modal) { has_css?(".create-invite-with-roles-modal__sent-to", text: email) }
+ end
+
+ def has_email_sent_confirmation?(email)
+ within(modal) { has_css?(".create-invite-with-roles-modal__email-sent", text: email) }
+ end
+ end
+ end
+end