From d63f1826fe23d60a7244ec1026884163973fb60c Mon Sep 17 00:00:00 2001
From: Ted Johansson <ted@discourse.org>
Date: Tue, 25 Jun 2024 19:32:18 +0800
Subject: [PATCH] FEATURE: User fields required for existing users - Part 2
 (#27172)

We want to allow admins to make new required fields apply to existing users. In order for this to work we need to have a way to make those users fill up the fields on their next page load. This is very similar to how adding a 2FA requirement post-fact works. Users will be redirected to a page where they can fill up the remaining required fields, and until they do that they won't be able to do anything else.
---
 .../components/admin-user-field-item.hbs      |  29 +-
 .../addon/components/admin-user-field-item.js |  35 +-
 .../user-menu/profile-tab-content.hbs         |   2 +-
 .../discourse/app/components/user-nav.hbs     |   2 +-
 .../app/controllers/preferences/profile.js    |  23 ++
 .../app/routes/preferences-profile.js         |  19 +
 .../discourse/app/routes/preferences.js       |   4 +-
 .../app/templates/preferences/profile.hbs     | 335 +++++++++---------
 .../tests/acceptance/user-menu-test.js        |   2 +-
 app/controllers/application_controller.rb     |  29 ++
 app/controllers/email_controller.rb           |   5 +-
 app/controllers/extra_locales_controller.rb   |   1 +
 .../finish_installation_controller.rb         |   5 +-
 app/controllers/highlight_js_controller.rb    |   1 +
 app/controllers/invites_controller.rb         |   1 +
 app/controllers/metadata_controller.rb        |   5 +-
 app/controllers/offline_controller.rb         |   5 +-
 app/controllers/pageview_controller.rb        |   1 +
 app/controllers/presence_controller.rb        |   2 +-
 app/controllers/published_pages_controller.rb |   2 +-
 app/controllers/qunit_controller.rb           |   7 +-
 app/controllers/robots_txt_controller.rb      |   5 +-
 app/controllers/session_controller.rb         |   1 +
 app/controllers/site_controller.rb            |   4 +-
 app/controllers/static_controller.rb          |   2 +-
 app/controllers/stylesheets_controller.rb     |   1 +
 app/controllers/svg_sprite_controller.rb      |   1 +
 .../theme_javascripts_controller.rb           |   1 +
 app/controllers/uploads_controller.rb         |   1 +
 app/controllers/user_api_keys_controller.rb   |   4 +-
 app/controllers/user_avatars_controller.rb    |   1 +
 .../users/omniauth_callbacks_controller.rb    |   2 +-
 app/controllers/users_controller.rb           |   2 +
 app/controllers/users_email_controller.rb     |   1 +
 app/models/user.rb                            |  16 +
 app/models/user_field.rb                      |  10 +
 app/models/user_history.rb                    |   2 +
 app/models/user_required_fields_version.rb    |  14 +
 app/serializers/current_user_serializer.rb    |   1 +
 app/services/user_updater.rb                  |   7 +
 config/locales/client.en.yml                  |   9 +-
 config/locales/server.en.yml                  |   2 +-
 ...226_create_user_required_fields_version.rb |  11 +
 .../chat/incoming_webhooks_controller.rb      |   4 +-
 spec/models/user_spec.rb                      |  41 +++
 spec/requests/application_controller_spec.rb  |  39 ++
 spec/services/user_updater_spec.rb            |  69 ++--
 spec/system/admin_user_fields_spec.rb         |  34 ++
 .../page_objects/pages/admin_user_fields.rb   |   6 +
 .../pages/user_preferences_profile.rb         |  12 +
 .../user_preferences_profile_spec.rb          |  52 +++
 51 files changed, 661 insertions(+), 209 deletions(-)
 create mode 100644 app/models/user_required_fields_version.rb
 create mode 100644 db/migrate/20240531053226_create_user_required_fields_version.rb
 create mode 100644 spec/system/page_objects/pages/user_preferences_profile.rb
 create mode 100644 spec/system/user_page/user_preferences_profile_spec.rb

diff --git a/app/assets/javascripts/admin/addon/components/admin-user-field-item.hbs b/app/assets/javascripts/admin/addon/components/admin-user-field-item.hbs
index a6bdfc2183e..82e174efe77 100644
--- a/app/assets/javascripts/admin/addon/components/admin-user-field-item.hbs
+++ b/app/assets/javascripts/admin/addon/components/admin-user-field-item.hbs
@@ -34,17 +34,36 @@
       <label class="optional">
         <RadioButton
           @value="optional"
-          @name="optional"
+          @name="requirement"
           @selection={{this.buffered.requirement}}
+          @onChange={{action "changeRequirementType"}}
         />
         <span>{{i18n "admin.user_fields.requirement.optional.title"}}</span>
       </label>
 
+      <label class="for_all_users">
+        <RadioButton
+          @value="for_all_users"
+          @name="requirement"
+          @selection={{this.buffered.requirement}}
+          @onChange={{action "changeRequirementType"}}
+        />
+        <div class="label-text">
+          <span>{{i18n
+              "admin.user_fields.requirement.for_all_users.title"
+            }}</span>
+          <div class="description">{{i18n
+              "admin.user_fields.requirement.for_all_users.description"
+            }}</div>
+        </div>
+      </label>
+
       <label class="on_signup">
         <RadioButton
           @value="on_signup"
-          @name="on_signup"
+          @name="requirement"
           @selection={{this.buffered.requirement}}
+          @onChange={{action "changeRequirementType"}}
         />
         <div class="label-text">
           <span>{{i18n "admin.user_fields.requirement.on_signup.title"}}</span>
@@ -57,7 +76,11 @@
 
     <AdminFormRow @label="admin.user_fields.preferences">
       <label>
-        <Input @type="checkbox" @checked={{this.buffered.editable}} />
+        <Input
+          @type="checkbox"
+          @checked={{this.buffered.editable}}
+          disabled={{this.editableDisabled}}
+        />
         <span>{{i18n "admin.user_fields.editable.title"}}</span>
       </label>
 
diff --git a/app/assets/javascripts/admin/addon/components/admin-user-field-item.js b/app/assets/javascripts/admin/addon/components/admin-user-field-item.js
index bcc05298901..d44fcd46512 100644
--- a/app/assets/javascripts/admin/addon/components/admin-user-field-item.js
+++ b/app/assets/javascripts/admin/addon/components/admin-user-field-item.js
@@ -3,6 +3,7 @@ import { action } from "@ember/object";
 import { schedule } from "@ember/runloop";
 import { service } from "@ember/service";
 import { isEmpty } from "@ember/utils";
+import { Promise } from "rsvp";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { i18n, propertyEqual } from "discourse/lib/computed";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
@@ -12,6 +13,7 @@ import UserField from "admin/models/user-field";
 
 export default Component.extend(bufferedProperty("userField"), {
   adminCustomUserFields: service(),
+  dialog: service(),
 
   tagName: "",
   isEditing: false,
@@ -64,8 +66,29 @@ export default Component.extend(bufferedProperty("userField"), {
     return ret.join(", ");
   },
 
+  @discourseComputed("buffered.requirement")
+  editableDisabled(requirement) {
+    return requirement === "for_all_users";
+  },
+
   @action
-  save() {
+  changeRequirementType(requirement) {
+    this.buffered.set("requirement", requirement);
+    this.buffered.set("editable", requirement === "for_all_users");
+  },
+
+  async _confirmChanges() {
+    return new Promise((resolve) => {
+      this.dialog.yesNoConfirm({
+        message: I18n.t("admin.user_fields.requirement.confirmation"),
+        didCancel: () => resolve(false),
+        didConfirm: () => resolve(true),
+      });
+    });
+  },
+
+  @action
+  async save() {
     const attrs = this.buffered.getProperties(
       "name",
       "description",
@@ -79,6 +102,16 @@ export default Component.extend(bufferedProperty("userField"), {
       ...this.adminCustomUserFields.additionalProperties
     );
 
+    let confirm = true;
+
+    if (attrs.requirement === "for_all_users") {
+      confirm = await this._confirmChanges();
+    }
+
+    if (!confirm) {
+      return;
+    }
+
     return this.userField
       .save(attrs)
       .then(() => {
diff --git a/app/assets/javascripts/discourse/app/components/user-menu/profile-tab-content.hbs b/app/assets/javascripts/discourse/app/components/user-menu/profile-tab-content.hbs
index 63a0d7bf90c..ead9b49845e 100644
--- a/app/assets/javascripts/discourse/app/components/user-menu/profile-tab-content.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-menu/profile-tab-content.hbs
@@ -69,7 +69,7 @@
     <LinkTo @route="preferences" @model={{this.currentUser}}>
       {{d-icon "cog"}}
       <span class="item-label">
-        {{i18n "user.preferences"}}
+        {{i18n "user.preferences.title"}}
       </span>
     </LinkTo>
   </li>
diff --git a/app/assets/javascripts/discourse/app/components/user-nav.hbs b/app/assets/javascripts/discourse/app/components/user-nav.hbs
index 4ee9b9831ad..d76a28b0dfe 100644
--- a/app/assets/javascripts/discourse/app/components/user-nav.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-nav.hbs
@@ -74,7 +74,7 @@
         class="user-nav__preferences"
       >
         {{d-icon "cog"}}
-        <span>{{i18n "user.preferences"}}</span>
+        <span>{{i18n "user.preferences.title"}}</span>
       </DNavigationItem>
     {{/if}}
     {{#if (and @isMobileView @isStaff)}}
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/profile.js b/app/assets/javascripts/discourse/app/controllers/preferences/profile.js
index 9ffb1cdab96..6adc744772c 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/profile.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/profile.js
@@ -42,6 +42,13 @@ export default Controller.extend({
       return;
     }
 
+    if (this.showEnforcedRequiredFieldsNotice) {
+      return this._missingRequiredFields(
+        this.site.user_fields,
+        this.model.user_fields
+      );
+    }
+
     // Staff can edit fields that are not `editable`
     if (!this.currentUser.staff) {
       siteUserFields = siteUserFields.filterBy("editable", true);
@@ -53,6 +60,11 @@ export default Controller.extend({
     });
   },
 
+  @discourseComputed("currentUser.needs_required_fields_check")
+  showEnforcedRequiredFieldsNotice(needsRequiredFieldsCheck) {
+    return needsRequiredFieldsCheck;
+  },
+
   @discourseComputed("model.user_option.default_calendar")
   canChangeDefaultCalendar(defaultCalendar) {
     return defaultCalendar !== "none_selected";
@@ -81,6 +93,16 @@ export default Controller.extend({
     document.querySelector(".feature-topic-on-profile-btn")?.focus();
   },
 
+  _missingRequiredFields(siteFields, userFields) {
+    return siteFields
+      .filter(
+        (siteField) =>
+          siteField.requirement === "for_all_users" &&
+          isEmpty(userFields[siteField.id])
+      )
+      .map((field) => EmberObject.create({ field, value: "" }));
+  },
+
   actions: {
     clearFeaturedTopicFromProfile() {
       this.dialog.yesNoConfirm({
@@ -132,6 +154,7 @@ export default Controller.extend({
             .then(() => {
               model.set("bio_cooked");
               this.set("saved", true);
+              this.currentUser.set("needs_required_fields_check", false);
             })
             .catch(popupAjaxError);
         })
diff --git a/app/assets/javascripts/discourse/app/routes/preferences-profile.js b/app/assets/javascripts/discourse/app/routes/preferences-profile.js
index 0ac07d167af..56d75a99c37 100644
--- a/app/assets/javascripts/discourse/app/routes/preferences-profile.js
+++ b/app/assets/javascripts/discourse/app/routes/preferences-profile.js
@@ -1,7 +1,26 @@
+import { action } from "@ember/object";
+import { service } from "@ember/service";
 import RestrictedUserRoute from "discourse/routes/restricted-user";
 
 export default class PreferencesProfile extends RestrictedUserRoute {
+  @service currentUser;
+
   setupController(controller, model) {
     controller.set("model", model);
   }
+
+  @action
+  willTransition(transition) {
+    super.willTransition(...arguments);
+
+    if (
+      this.currentUser?.needs_required_fields_check &&
+      !transition?.to.name.startsWith("admin")
+    ) {
+      transition.abort();
+      return false;
+    }
+
+    return true;
+  }
 }
diff --git a/app/assets/javascripts/discourse/app/routes/preferences.js b/app/assets/javascripts/discourse/app/routes/preferences.js
index 3b521b39255..02ddb803938 100644
--- a/app/assets/javascripts/discourse/app/routes/preferences.js
+++ b/app/assets/javascripts/discourse/app/routes/preferences.js
@@ -13,7 +13,7 @@ export default class Preferences extends RestrictedUserRoute {
     let controller = this.controllerFor(this.router.currentRouteName);
     let subpageTitle = controller?.subpageTitle;
     return subpageTitle
-      ? `${subpageTitle} - ${I18n.t("user.preferences")}`
-      : I18n.t("user.preferences");
+      ? `${subpageTitle} - ${I18n.t("user.preferences.title")}`
+      : I18n.t("user.preferences.title");
   }
 }
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/profile.hbs b/app/assets/javascripts/discourse/app/templates/preferences/profile.hbs
index 2317cf9726c..d8813d5f4ae 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/profile.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/profile.hbs
@@ -1,58 +1,66 @@
-{{#if this.canChangeBio}}
-  <div class="control-group pref-bio" data-setting-name="user-bio">
-    <label class="control-label">{{i18n "user.bio"}}</label>
-    <div class="controls bio-composer input-xxlarge">
-      <DEditor @value={{this.model.bio_raw}} />
-    </div>
-  </div>
+{{#if this.showEnforcedRequiredFieldsNotice}}
+  <div class="alert alert-error">{{i18n
+      "user.preferences.profile.enforced_required_fields"
+    }}</div>
 {{/if}}
 
-<div class="control-group pref-timezone" data-setting-name="user-timezone">
-  <label class="control-label">{{i18n "user.timezone"}}</label>
-  <TimezoneInput
-    @value={{this.model.user_option.timezone}}
-    @onChange={{fn (mut this.model.user_option.timezone)}}
-    class="input-xxlarge"
-  />
-  <DButton
-    @icon="globe"
-    @label="user.use_current_timezone"
-    @action={{action "useCurrentTimezone"}}
-    class="btn-default"
-  />
-</div>
-
-{{#if this.model.can_change_location}}
-  <div class="control-group pref-location" data-setting-name="user-location">
-    <label class="control-label" for="edit-location">{{i18n
-        "user.location"
-      }}</label>
-    <div class="controls">
-      <Input
-        @type="text"
-        @value={{this.model.location}}
-        class="input-xxlarge"
-        id="edit-location"
-      />
+{{#unless this.showEnforcedRequiredFieldsNotice}}
+  {{#if this.canChangeBio}}
+    <div class="control-group pref-bio" data-setting-name="user-bio">
+      <label class="control-label">{{i18n "user.bio"}}</label>
+      <div class="controls bio-composer input-xxlarge">
+        <DEditor @value={{this.model.bio_raw}} />
+      </div>
     </div>
-  </div>
-{{/if}}
+  {{/if}}
 
-{{#if this.model.can_change_website}}
-  <div class="control-group pref-website" data-setting-name="user-website">
-    <label class="control-label" for="edit-website">{{i18n
-        "user.website"
-      }}</label>
-    <div class="controls">
-      <Input
-        @type="text"
-        @value={{this.model.website}}
-        class="input-xxlarge"
-        id="edit-website"
-      />
-    </div>
+  <div class="control-group pref-timezone" data-setting-name="user-timezone">
+    <label class="control-label">{{i18n "user.timezone"}}</label>
+    <TimezoneInput
+      @value={{this.model.user_option.timezone}}
+      @onChange={{fn (mut this.model.user_option.timezone)}}
+      class="input-xxlarge"
+    />
+    <DButton
+      @icon="globe"
+      @label="user.use_current_timezone"
+      @action={{action "useCurrentTimezone"}}
+      class="btn-default"
+    />
   </div>
-{{/if}}
+
+  {{#if this.model.can_change_location}}
+    <div class="control-group pref-location" data-setting-name="user-location">
+      <label class="control-label" for="edit-location">{{i18n
+          "user.location"
+        }}</label>
+      <div class="controls">
+        <Input
+          @type="text"
+          @value={{this.model.location}}
+          class="input-xxlarge"
+          id="edit-location"
+        />
+      </div>
+    </div>
+  {{/if}}
+
+  {{#if this.model.can_change_website}}
+    <div class="control-group pref-website" data-setting-name="user-website">
+      <label class="control-label" for="edit-website">{{i18n
+          "user.website"
+        }}</label>
+      <div class="controls">
+        <Input
+          @type="text"
+          @value={{this.model.website}}
+          class="input-xxlarge"
+          id="edit-website"
+        />
+      </div>
+    </div>
+  {{/if}}
+{{/unless}}
 
 {{#each this.userFields as |uf|}}
   <div class="control-group" data-setting-name="user-user-fields">
@@ -61,128 +69,133 @@
 {{/each}}
 <div class="clearfix"></div>
 
-{{#if this.siteSettings.allow_profile_backgrounds}}
-  {{#if this.canUploadProfileHeader}}
-    <div
-      class="control-group pref-profile-bg"
-      data-setting-name="user-profile-bg"
-    >
-      <label class="control-label">{{i18n
-          "user.change_profile_background.title"
-        }}</label>
-      <div class="controls">
-        <UppyImageUploader
-          @imageUrl={{this.model.profile_background_upload_url}}
-          @type="profile_background"
-          @id="profile-background-uploader"
-        />
+{{#unless this.showEnforcedRequiredFieldsNotice}}
+  {{#if this.siteSettings.allow_profile_backgrounds}}
+    {{#if this.canUploadProfileHeader}}
+      <div
+        class="control-group pref-profile-bg"
+        data-setting-name="user-profile-bg"
+      >
+        <label class="control-label">{{i18n
+            "user.change_profile_background.title"
+          }}</label>
+        <div class="controls">
+          <UppyImageUploader
+            @imageUrl={{this.model.profile_background_upload_url}}
+            @type="profile_background"
+            @id="profile-background-uploader"
+          />
+        </div>
+        <div class="instructions">
+          {{i18n "user.change_profile_background.instructions"}}
+        </div>
       </div>
-      <div class="instructions">
-        {{i18n "user.change_profile_background.instructions"}}
-      </div>
-    </div>
-  {{/if}}
-  {{#if this.canUploadUserCardBackground}}
-    <div class="control-group pref-profile-bg" data-setting-name="user-card-bg">
-      <label class="control-label">{{i18n
-          "user.change_card_background.title"
-        }}</label>
-      <div class="controls">
-        <UppyImageUploader
-          @imageUrl={{this.model.card_background_upload_url}}
-          @type="card_background"
-          @id="profile-card-background-uploader"
-        />
-      </div>
-      <div class="instructions">
-        {{i18n "user.change_card_background.instructions"}}
-      </div>
-    </div>
-  {{/if}}
-{{/if}}
-
-{{#if this.siteSettings.allow_featured_topic_on_user_profiles}}
-  <div class="control-group" data-setting-name="user-featured-topic">
-    <label class="control-label">{{i18n "user.featured_topic"}}</label>
-    {{#if this.model.featured_topic}}
-      <label class="featured-topic-link">
-        <LinkTo
-          @route="topic"
-          @models={{array
-            this.model.featured_topic.slug
-            this.model.featured_topic.id
-          }}
-        >
-          {{replace-emoji (html-safe this.model.featured_topic.fancy_title)}}
-        </LinkTo>
-      </label>
     {{/if}}
+    {{#if this.canUploadUserCardBackground}}
+      <div
+        class="control-group pref-profile-bg"
+        data-setting-name="user-card-bg"
+      >
+        <label class="control-label">{{i18n
+            "user.change_card_background.title"
+          }}</label>
+        <div class="controls">
+          <UppyImageUploader
+            @imageUrl={{this.model.card_background_upload_url}}
+            @type="card_background"
+            @id="profile-card-background-uploader"
+          />
+        </div>
+        <div class="instructions">
+          {{i18n "user.change_card_background.instructions"}}
+        </div>
+      </div>
+    {{/if}}
+  {{/if}}
 
-    <div>
-      <DButton
-        @action={{this.showFeaturedTopicModal}}
-        @label="user.feature_topic_on_profile.open_search"
-        class="btn-default feature-topic-on-profile-btn"
-      />
+  {{#if this.siteSettings.allow_featured_topic_on_user_profiles}}
+    <div class="control-group" data-setting-name="user-featured-topic">
+      <label class="control-label">{{i18n "user.featured_topic"}}</label>
       {{#if this.model.featured_topic}}
-        <DButton
-          @action={{action "clearFeaturedTopicFromProfile"}}
-          @label="user.feature_topic_on_profile.clear.title"
-          class="btn-danger clear-feature-topic-on-profile-btn"
-        />
+        <label class="featured-topic-link">
+          <LinkTo
+            @route="topic"
+            @models={{array
+              this.model.featured_topic.slug
+              this.model.featured_topic.id
+            }}
+          >
+            {{replace-emoji (html-safe this.model.featured_topic.fancy_title)}}
+          </LinkTo>
+        </label>
       {{/if}}
+
+      <div>
+        <DButton
+          @action={{this.showFeaturedTopicModal}}
+          @label="user.feature_topic_on_profile.open_search"
+          class="btn-default feature-topic-on-profile-btn"
+        />
+        {{#if this.model.featured_topic}}
+          <DButton
+            @action={{action "clearFeaturedTopicFromProfile"}}
+            @label="user.feature_topic_on_profile.clear.title"
+            class="btn-danger clear-feature-topic-on-profile-btn"
+          />
+        {{/if}}
+      </div>
+      <div class="instructions">
+        {{i18n "user.change_featured_topic.instructions"}}
+      </div>
     </div>
-    <div class="instructions">
-      {{i18n "user.change_featured_topic.instructions"}}
+  {{/if}}
+
+  {{#if this.canChangeDefaultCalendar}}
+    <div class="control-group" data-setting-name="user-default-calendar">
+      <label class="control-label">{{i18n
+          "download_calendar.default_calendar"
+        }}</label>
+      <div>
+        <ComboBox
+          @valueProperty="value"
+          @content={{this.calendarOptions}}
+          @value={{this.model.user_option.default_calendar}}
+          @id="user-default-calendar"
+          @onChange={{fn (mut this.model.user_option.default_calendar)}}
+        />
+      </div>
+      <div class="instructions">
+        {{i18n "download_calendar.default_calendar_instruction"}}
+      </div>
     </div>
-  </div>
-{{/if}}
+  {{/if}}
 
-{{#if this.canChangeDefaultCalendar}}
-  <div class="control-group" data-setting-name="user-default-calendar">
-    <label class="control-label">{{i18n
-        "download_calendar.default_calendar"
-      }}</label>
-    <div>
-      <ComboBox
-        @valueProperty="value"
-        @content={{this.calendarOptions}}
-        @value={{this.model.user_option.default_calendar}}
-        @id="user-default-calendar"
-        @onChange={{fn (mut this.model.user_option.default_calendar)}}
-      />
-    </div>
-    <div class="instructions">
-      {{i18n "download_calendar.default_calendar_instruction"}}
-    </div>
-  </div>
-{{/if}}
+  <span>
+    <PluginOutlet
+      @name="user-preferences-profile"
+      @connectorTagName="div"
+      @outletArgs={{hash model=this.model save=(action "save")}}
+    />
+  </span>
 
-<span>
-  <PluginOutlet
-    @name="user-preferences-profile"
-    @connectorTagName="div"
-    @outletArgs={{hash model=this.model save=(action "save")}}
-  />
-</span>
+  <span>
+    <PluginOutlet
+      @name="user-custom-preferences"
+      @connectorTagName="div"
+      @outletArgs={{hash model=this.model}}
+    />
+  </span>
 
-<span>
-  <PluginOutlet
-    @name="user-custom-preferences"
-    @connectorTagName="div"
-    @outletArgs={{hash model=this.model}}
-  />
-</span>
+  <br />
 
-<br />
-
-<span>
-  <PluginOutlet
-    @name="user-custom-controls"
-    @connectorTagName="div"
-    @outletArgs={{hash model=this.model}}
-  />
-</span>
+  <span>
+    <PluginOutlet
+      @name="user-custom-controls"
+      @connectorTagName="div"
+      @outletArgs={{hash model=this.model}}
+    />
+  </span>
+{{/unless}}
 
 <SaveControls
   @model={{this.model}}
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js
index 5d392420f46..21ee5766b13 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js
@@ -529,7 +529,7 @@ acceptance("User menu", function (needs) {
     );
     assert.strictEqual(
       preferencesLink.textContent.trim(),
-      I18n.t("user.preferences"),
+      I18n.t("user.preferences.title"),
       "preferences link has the right label"
     );
     assert.ok(
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 5be62ad22e5..482e672f0e3 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -41,6 +41,7 @@ class ApplicationController < ActionController::Base
   before_action :authorize_mini_profiler
   before_action :redirect_to_login_if_required
   before_action :block_if_requires_login
+  before_action :redirect_to_profile_if_required
   before_action :preload_json
   before_action :check_xhr
   after_action :add_readonly_header
@@ -907,6 +908,34 @@ class ApplicationController < ActionController::Base
       (!SiteSetting.enforce_second_factor_on_external_auth && secure_session["oauth"] == "true")
   end
 
+  def redirect_to_profile_if_required
+    return if request.format.json?
+    return if !current_user
+    return if !current_user.needs_required_fields_check?
+
+    if current_user.populated_required_custom_fields?
+      current_user.bump_required_fields_version
+      return
+    end
+
+    redirect_path = path("/u/#{current_user.encoded_username}/preferences/profile")
+    second_factor_path = path("/u/#{current_user.encoded_username}/preferences/second-factor")
+    allowed_paths = [redirect_path, second_factor_path, path("/admin")]
+    if allowed_paths.none? { |p| request.fullpath.start_with?(p) }
+      rate_limiter = RateLimiter.new(current_user, "redirect_to_required_fields_log", 1, 24.hours)
+
+      if rate_limiter.performed!(raise_error: false)
+        UserHistory.create!(
+          action: UserHistory.actions[:redirected_to_required_fields],
+          acting_user_id: current_user.id,
+        )
+      end
+
+      redirect_to path(redirect_path)
+      nil
+    end
+  end
+
   def build_not_found_page(opts = {})
     if SiteSetting.bootstrap_error_pages?
       preload_json
diff --git a/app/controllers/email_controller.rb b/app/controllers/email_controller.rb
index ed317022724..66fb8a0af62 100644
--- a/app/controllers/email_controller.rb
+++ b/app/controllers/email_controller.rb
@@ -3,7 +3,10 @@
 class EmailController < ApplicationController
   layout "no_ember"
 
-  skip_before_action :check_xhr, :preload_json, :redirect_to_login_if_required
+  skip_before_action :check_xhr,
+                     :preload_json,
+                     :redirect_to_login_if_required,
+                     :redirect_to_profile_if_required
 
   def unsubscribe
     key = UnsubscribeKey.includes(:user).find_by(key: params[:key])
diff --git a/app/controllers/extra_locales_controller.rb b/app/controllers/extra_locales_controller.rb
index a9f075c367f..58c00f8a47d 100644
--- a/app/controllers/extra_locales_controller.rb
+++ b/app/controllers/extra_locales_controller.rb
@@ -6,6 +6,7 @@ class ExtraLocalesController < ApplicationController
   skip_before_action :check_xhr,
                      :preload_json,
                      :redirect_to_login_if_required,
+                     :redirect_to_profile_if_required,
                      :verify_authenticity_token
 
   OVERRIDES_BUNDLE ||= "overrides"
diff --git a/app/controllers/finish_installation_controller.rb b/app/controllers/finish_installation_controller.rb
index d584710ff86..6a4964aa411 100644
--- a/app/controllers/finish_installation_controller.rb
+++ b/app/controllers/finish_installation_controller.rb
@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
 class FinishInstallationController < ApplicationController
-  skip_before_action :check_xhr, :preload_json, :redirect_to_login_if_required
+  skip_before_action :check_xhr,
+                     :preload_json,
+                     :redirect_to_login_if_required,
+                     :redirect_to_profile_if_required
   layout "finish_installation"
 
   before_action :ensure_no_admins, except: %w[confirm_email resend_email]
diff --git a/app/controllers/highlight_js_controller.rb b/app/controllers/highlight_js_controller.rb
index b77c14e82a9..5be604ffad7 100644
--- a/app/controllers/highlight_js_controller.rb
+++ b/app/controllers/highlight_js_controller.rb
@@ -3,6 +3,7 @@
 class HighlightJsController < ApplicationController
   skip_before_action :preload_json,
                      :redirect_to_login_if_required,
+                     :redirect_to_profile_if_required,
                      :check_xhr,
                      :verify_authenticity_token,
                      only: [:show]
diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb
index a9f8ac7d1f0..8e17f9059f1 100644
--- a/app/controllers/invites_controller.rb
+++ b/app/controllers/invites_controller.rb
@@ -16,6 +16,7 @@ class InvitesController < ApplicationController
   skip_before_action :check_xhr, except: [:perform_accept_invitation]
   skip_before_action :preload_json, except: [:show]
   skip_before_action :redirect_to_login_if_required
+  skip_before_action :redirect_to_profile_if_required
 
   before_action :ensure_invites_allowed, only: %i[show perform_accept_invitation]
   before_action :ensure_new_registrations_allowed, only: %i[show perform_accept_invitation]
diff --git a/app/controllers/metadata_controller.rb b/app/controllers/metadata_controller.rb
index 7a1fffb7dc7..fb0a13f4da0 100644
--- a/app/controllers/metadata_controller.rb
+++ b/app/controllers/metadata_controller.rb
@@ -2,7 +2,10 @@
 
 class MetadataController < ApplicationController
   layout false
-  skip_before_action :preload_json, :check_xhr, :redirect_to_login_if_required
+  skip_before_action :preload_json,
+                     :check_xhr,
+                     :redirect_to_login_if_required,
+                     :redirect_to_profile_if_required
 
   def manifest
     expires_in 1.minutes
diff --git a/app/controllers/offline_controller.rb b/app/controllers/offline_controller.rb
index b826e3f30dc..a2caee5c9c1 100644
--- a/app/controllers/offline_controller.rb
+++ b/app/controllers/offline_controller.rb
@@ -2,7 +2,10 @@
 
 class OfflineController < ApplicationController
   layout false
-  skip_before_action :preload_json, :check_xhr, :redirect_to_login_if_required
+  skip_before_action :preload_json,
+                     :check_xhr,
+                     :redirect_to_login_if_required,
+                     :redirect_to_profile_if_required
 
   def index
     render :offline, content_type: "text/html"
diff --git a/app/controllers/pageview_controller.rb b/app/controllers/pageview_controller.rb
index 2b669eaf515..013e9e45af3 100644
--- a/app/controllers/pageview_controller.rb
+++ b/app/controllers/pageview_controller.rb
@@ -3,6 +3,7 @@
 class PageviewController < ApplicationController
   skip_before_action :check_xhr,
                      :redirect_to_login_if_required,
+                     :redirect_to_profile_if_required,
                      :preload_json,
                      :verify_authenticity_token
 
diff --git a/app/controllers/presence_controller.rb b/app/controllers/presence_controller.rb
index 102edcebf3a..a4ab2d57e5f 100644
--- a/app/controllers/presence_controller.rb
+++ b/app/controllers/presence_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class PresenceController < ApplicationController
-  skip_before_action :check_xhr
+  skip_before_action :check_xhr, :redirect_to_profile_if_required
   before_action :ensure_logged_in, only: [:update]
   before_action :skip_persist_session
 
diff --git a/app/controllers/published_pages_controller.rb b/app/controllers/published_pages_controller.rb
index 328e2ba408f..af82109021f 100644
--- a/app/controllers/published_pages_controller.rb
+++ b/app/controllers/published_pages_controller.rb
@@ -4,7 +4,7 @@ class PublishedPagesController < ApplicationController
   skip_before_action :preload_json
   skip_before_action :check_xhr, :verify_authenticity_token, only: [:show]
   before_action :ensure_publish_enabled
-  before_action :redirect_to_login_if_required, except: [:show]
+  before_action :redirect_to_login_if_required, :redirect_to_profile_if_required, except: [:show]
 
   def show
     params.require(:slug)
diff --git a/app/controllers/qunit_controller.rb b/app/controllers/qunit_controller.rb
index 0911a9434b4..305ed4a0a7c 100644
--- a/app/controllers/qunit_controller.rb
+++ b/app/controllers/qunit_controller.rb
@@ -1,7 +1,12 @@
 # frozen_string_literal: true
 
 class QunitController < ApplicationController
-  skip_before_action *%i[check_xhr preload_json redirect_to_login_if_required]
+  skip_before_action *%i[
+                       check_xhr
+                       preload_json
+                       redirect_to_login_if_required
+                       redirect_to_profile_if_required
+                     ]
   layout false
 
   def theme
diff --git a/app/controllers/robots_txt_controller.rb b/app/controllers/robots_txt_controller.rb
index d9e4ea2a73c..0d7d8ee7cd5 100644
--- a/app/controllers/robots_txt_controller.rb
+++ b/app/controllers/robots_txt_controller.rb
@@ -2,7 +2,10 @@
 
 class RobotsTxtController < ApplicationController
   layout false
-  skip_before_action :preload_json, :check_xhr, :redirect_to_login_if_required
+  skip_before_action :preload_json,
+                     :check_xhr,
+                     :redirect_to_login_if_required,
+                     :redirect_to_profile_if_required
 
   OVERRIDDEN_HEADER = "# This robots.txt file has been customized at /admin/customize/robots\n"
 
diff --git a/app/controllers/session_controller.rb b/app/controllers/session_controller.rb
index 16632946088..4f661afc427 100644
--- a/app/controllers/session_controller.rb
+++ b/app/controllers/session_controller.rb
@@ -5,6 +5,7 @@ class SessionController < ApplicationController
                 only: %i[create forgot_password passkey_challenge passkey_login]
   before_action :rate_limit_login, only: %i[create email_login]
   skip_before_action :redirect_to_login_if_required
+  skip_before_action :redirect_to_profile_if_required
   skip_before_action :preload_json,
                      :check_xhr,
                      only: %i[sso sso_login sso_provider destroy one_time_password]
diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 4cfa9e6e047..9b6d2cb5ae4 100644
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -3,7 +3,9 @@
 class SiteController < ApplicationController
   layout false
   skip_before_action :preload_json, :check_xhr
-  skip_before_action :redirect_to_login_if_required, only: %w[basic_info statistics]
+  skip_before_action :redirect_to_login_if_required,
+                     :redirect_to_profile_if_required,
+                     only: %w[basic_info statistics]
 
   def site
     render json: Site.json_for(guardian)
diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb
index b2e7473fc61..2d16f24bf29 100644
--- a/app/controllers/static_controller.rb
+++ b/app/controllers/static_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class StaticController < ApplicationController
-  skip_before_action :check_xhr, :redirect_to_login_if_required
+  skip_before_action :check_xhr, :redirect_to_login_if_required, :redirect_to_profile_if_required
   skip_before_action :verify_authenticity_token,
                      only: %i[cdn_asset enter favicon service_worker_asset]
   skip_before_action :preload_json, only: %i[cdn_asset enter favicon service_worker_asset]
diff --git a/app/controllers/stylesheets_controller.rb b/app/controllers/stylesheets_controller.rb
index 24abd4151b2..12a477122c5 100644
--- a/app/controllers/stylesheets_controller.rb
+++ b/app/controllers/stylesheets_controller.rb
@@ -3,6 +3,7 @@
 class StylesheetsController < ApplicationController
   skip_before_action :preload_json,
                      :redirect_to_login_if_required,
+                     :redirect_to_profile_if_required,
                      :check_xhr,
                      :verify_authenticity_token,
                      only: %i[show show_source_map color_scheme]
diff --git a/app/controllers/svg_sprite_controller.rb b/app/controllers/svg_sprite_controller.rb
index 925de81d1aa..920769d50d2 100644
--- a/app/controllers/svg_sprite_controller.rb
+++ b/app/controllers/svg_sprite_controller.rb
@@ -3,6 +3,7 @@
 class SvgSpriteController < ApplicationController
   skip_before_action :preload_json,
                      :redirect_to_login_if_required,
+                     :redirect_to_profile_if_required,
                      :check_xhr,
                      :verify_authenticity_token,
                      only: %i[show search svg_icon]
diff --git a/app/controllers/theme_javascripts_controller.rb b/app/controllers/theme_javascripts_controller.rb
index 6706db2cbe0..087f127b13a 100644
--- a/app/controllers/theme_javascripts_controller.rb
+++ b/app/controllers/theme_javascripts_controller.rb
@@ -8,6 +8,7 @@ class ThemeJavascriptsController < ApplicationController
     :handle_theme,
     :preload_json,
     :redirect_to_login_if_required,
+    :redirect_to_profile_if_required,
     :verify_authenticity_token,
     only: %i[show show_map show_tests],
   )
diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
index 9e9a2c3a340..1956db8184d 100644
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -11,6 +11,7 @@ class UploadsController < ApplicationController
   skip_before_action :preload_json,
                      :check_xhr,
                      :redirect_to_login_if_required,
+                     :redirect_to_profile_if_required,
                      only: %i[show show_short _show_secure_deprecated show_secure]
   protect_from_forgery except: :show
 
diff --git a/app/controllers/user_api_keys_controller.rb b/app/controllers/user_api_keys_controller.rb
index 64b07dc96fe..65334c6195d 100644
--- a/app/controllers/user_api_keys_controller.rb
+++ b/app/controllers/user_api_keys_controller.rb
@@ -4,7 +4,9 @@ class UserApiKeysController < ApplicationController
   layout "no_ember"
 
   requires_login only: %i[create create_otp revoke undo_revoke]
-  skip_before_action :redirect_to_login_if_required, only: %i[new otp]
+  skip_before_action :redirect_to_login_if_required,
+                     :redirect_to_profile_if_required,
+                     only: %i[new otp]
   skip_before_action :check_xhr, :preload_json
 
   AUTH_API_VERSION ||= 4
diff --git a/app/controllers/user_avatars_controller.rb b/app/controllers/user_avatars_controller.rb
index 0fe52b69c34..b18497a5624 100644
--- a/app/controllers/user_avatars_controller.rb
+++ b/app/controllers/user_avatars_controller.rb
@@ -3,6 +3,7 @@
 class UserAvatarsController < ApplicationController
   skip_before_action :preload_json,
                      :redirect_to_login_if_required,
+                     :redirect_to_profile_if_required,
                      :check_xhr,
                      :verify_authenticity_token,
                      only: %i[show show_letter show_proxy_letter]
diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 680c891a7d5..e6d820cec68 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 class Users::OmniauthCallbacksController < ApplicationController
-  skip_before_action :redirect_to_login_if_required
+  skip_before_action :redirect_to_login_if_required, :redirect_to_profile_if_required
 
   layout "no_ember"
 
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 55160590e0d..3d30899474b 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -86,6 +86,7 @@ class UsersController < ApplicationController
   #  once that happens you can't log in with social
   skip_before_action :verify_authenticity_token, only: [:create]
   skip_before_action :redirect_to_login_if_required,
+                     :redirect_to_profile_if_required,
                      only: %i[
                        check_username
                        check_email
@@ -102,6 +103,7 @@ class UsersController < ApplicationController
                        admin_login
                        confirm_admin
                      ]
+  skip_before_action :redirect_to_profile_if_required, only: %i[show staff_info update]
 
   after_action :add_noindex_header, only: %i[show my_redirect]
 
diff --git a/app/controllers/users_email_controller.rb b/app/controllers/users_email_controller.rb
index 83b10c14698..7a7dd97144c 100644
--- a/app/controllers/users_email_controller.rb
+++ b/app/controllers/users_email_controller.rb
@@ -6,6 +6,7 @@ class UsersEmailController < ApplicationController
   skip_before_action :check_xhr, only: %i[show_confirm_old_email show_confirm_new_email]
 
   skip_before_action :redirect_to_login_if_required,
+                     :redirect_to_profile_if_required,
                      only: %i[
                        show_confirm_old_email
                        show_confirm_new_email
diff --git a/app/models/user.rb b/app/models/user.rb
index 47464ebc707..5dcc511a805 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1843,6 +1843,21 @@ class User < ActiveRecord::Base
     end
   end
 
+  def populated_required_custom_fields?
+    UserField
+      .required
+      .pluck(:id)
+      .all? { |field_id| custom_fields["#{User::USER_FIELD_PREFIX}#{field_id}"].present? }
+  end
+
+  def needs_required_fields_check?
+    (required_fields_version || 0) < UserRequiredFieldsVersion.current
+  end
+
+  def bump_required_fields_version
+    update(required_fields_version: UserRequiredFieldsVersion.current)
+  end
+
   protected
 
   def badge_grant
@@ -2225,6 +2240,7 @@ end
 #  flair_group_id            :integer
 #  last_seen_reviewable_id   :integer
 #  password_algorithm        :string(64)
+#  required_fields_version   :integer
 #
 # Indexes
 #
diff --git a/app/models/user_field.rb b/app/models/user_field.rb
index 9feb3636864..212f948d286 100644
--- a/app/models/user_field.rb
+++ b/app/models/user_field.rb
@@ -15,9 +15,12 @@ class UserField < ActiveRecord::Base
   accepts_nested_attributes_for :user_field_options
 
   before_save :sanitize_description
+  after_create :update_required_fields_version
+  after_update :update_required_fields_version, if: -> { saved_change_to_requirement? }
   after_save :queue_index_search
 
   scope :public_fields, -> { where(show_on_profile: true).or(where(show_on_user_card: true)) }
+  scope :required, -> { not_optional }
 
   enum :requirement, { optional: 0, for_all_users: 1, on_signup: 2 }.freeze
   enum :field_type_enum, { text: 0, confirm: 1, dropdown: 2, multiselect: 3 }.freeze
@@ -37,6 +40,13 @@ class UserField < ActiveRecord::Base
 
   private
 
+  def update_required_fields_version
+    return if !for_all_users?
+
+    UserRequiredFieldsVersion.create
+    Discourse.request_refresh!
+  end
+
   def sanitize_description
     if description_changed?
       self.description = sanitize_field(self.description, additional_attributes: ["target"])
diff --git a/app/models/user_history.rb b/app/models/user_history.rb
index 78146253b12..4377ef00c42 100644
--- a/app/models/user_history.rb
+++ b/app/models/user_history.rb
@@ -144,6 +144,8 @@ class UserHistory < ActiveRecord::Base
         create_watched_word_group: 105,
         update_watched_word_group: 106,
         delete_watched_word_group: 107,
+        redirected_to_required_fields: 108,
+        filled_in_required_fields: 109,
       )
   end
 
diff --git a/app/models/user_required_fields_version.rb b/app/models/user_required_fields_version.rb
new file mode 100644
index 00000000000..13c772ba8da
--- /dev/null
+++ b/app/models/user_required_fields_version.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class UserRequiredFieldsVersion < ActiveRecord::Base
+  def self.current = maximum(:id) || 0
+end
+
+# == Schema Information
+#
+# Table name: user_required_fields_versions
+#
+#  id         :bigint           not null, primary key
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
diff --git a/app/serializers/current_user_serializer.rb b/app/serializers/current_user_serializer.rb
index d9e972ddbbf..3d1a6e9ae43 100644
--- a/app/serializers/current_user_serializer.rb
+++ b/app/serializers/current_user_serializer.rb
@@ -58,6 +58,7 @@ class CurrentUserSerializer < BasicUserSerializer
              :associated_account_ids,
              :top_category_ids,
              :groups,
+             :needs_required_fields_check?,
              :second_factor_enabled,
              :ignored_users,
              :featured_topic,
diff --git a/app/services/user_updater.rb b/app/services/user_updater.rb
index 5f7f6272732..a2e28d2d612 100644
--- a/app/services/user_updater.rb
+++ b/app/services/user_updater.rb
@@ -266,6 +266,13 @@ class UserUpdater
         end
       end
       DiscourseEvent.trigger(:user_updated, user)
+
+      if attributes[:custom_fields].present? && user.needs_required_fields_check?
+        UserHistory.create!(
+          action: UserHistory.actions[:filled_in_required_fields],
+          acting_user_id: user.id,
+        )
+      end
     end
 
     saved
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 8eeab0f02bd..48373b6d9a1 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1197,7 +1197,10 @@ en:
       activity_stream: "Activity"
       read: "Read"
       read_help: "Recently read topics"
-      preferences: "Preferences"
+      preferences:
+        title: "Preferences"
+        profile:
+          enforced_required_fields: "You are required to provide additional information before continuing to use this site."
       feature_topic_on_profile:
         open_search: "Select a New Topic"
         title: "Select a Topic"
@@ -6669,9 +6672,13 @@ en:
           title: "Field Requirement"
           optional:
             title: "Optional"
+          for_all_users:
+            title: "For all users"
+            description: "When new users sign up, they must fill out this field. When existing users return to the site and this is a new required field for them, they will also be prompted to fill it out. To re-prompt all users, delete this custom field and re-create it."
           on_signup:
             title: "On signup"
             description: "When new users sign up, they must fill out this field. Existing users are unaffected."
+          confirmation: "This will prompt existing users to fill in this field and will not allow them to do anything else on your site until the field is filled. Proceed?"
         editable:
           title: "Editable after signup"
           enabled: "editable"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 6a44e7130d8..1a9389e8bb7 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2931,7 +2931,7 @@ en:
     email_too_long: "The email you provided is too long. Mailbox names must be no more than 254 characters, and domain names must be no more than 253 characters."
     wrong_invite_code: "The invite code you entered was incorrect."
     reserved_username: "That username is not allowed."
-    missing_user_field: "You have not completed all the user fields"
+    missing_user_field: "You have not completed all the required user fields"
     auth_complete: "Authentication is complete."
     click_to_continue: "Click here to continue."
     already_logged_in: "Sorry! This invitation is intended for new users, who do not already have an existing account."
diff --git a/db/migrate/20240531053226_create_user_required_fields_version.rb b/db/migrate/20240531053226_create_user_required_fields_version.rb
new file mode 100644
index 00000000000..c90090aef03
--- /dev/null
+++ b/db/migrate/20240531053226_create_user_required_fields_version.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class CreateUserRequiredFieldsVersion < ActiveRecord::Migration[7.0]
+  def change
+    create_table :user_required_fields_versions do |t|
+      t.timestamps null: false
+    end
+
+    add_column :users, :required_fields_version, :integer
+  end
+end
diff --git a/plugins/chat/app/controllers/chat/incoming_webhooks_controller.rb b/plugins/chat/app/controllers/chat/incoming_webhooks_controller.rb
index df97db10270..7d5d33b0edc 100644
--- a/plugins/chat/app/controllers/chat/incoming_webhooks_controller.rb
+++ b/plugins/chat/app/controllers/chat/incoming_webhooks_controller.rb
@@ -8,7 +8,9 @@ module Chat
 
     WEBHOOK_MESSAGES_PER_MINUTE_LIMIT = 10
 
-    skip_before_action :verify_authenticity_token, :redirect_to_login_if_required
+    skip_before_action :verify_authenticity_token,
+                       :redirect_to_login_if_required,
+                       :redirect_to_profile_if_required
 
     before_action :validate_payload
 
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 4b06b324de6..f7b1ee1d0f8 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -3552,4 +3552,45 @@ RSpec.describe User do
       expect(user.new_personal_messages_notifications_count).to eq(1)
     end
   end
+
+  describe "#populated_required_fields?" do
+    let!(:required_field) { Fabricate(:user_field, name: "hairstyle") }
+    let!(:optional_field) { Fabricate(:user_field, name: "haircolor", requirement: "optional") }
+
+    context "when all required fields are populated" do
+      before { user.set_user_field(required_field.id, "bald") }
+
+      it { expect(user.populated_required_custom_fields?).to eq(true) }
+    end
+
+    context "when some required fields are missing values" do
+      it { expect(user.populated_required_custom_fields?).to eq(false) }
+    end
+  end
+
+  describe "#needs_required_fields_check?" do
+    let!(:version) { UserRequiredFieldsVersion.create! }
+
+    context "when version number is up to date" do
+      before { user.update(required_fields_version: version.id) }
+
+      it { expect(user.needs_required_fields_check?).to eq(false) }
+    end
+
+    context "when version number is out of date" do
+      before { user.update(required_fields_version: version.id - 1) }
+
+      it { expect(user.needs_required_fields_check?).to eq(true) }
+    end
+  end
+
+  describe "#bump_required_fields_version" do
+    let!(:version) { UserRequiredFieldsVersion.create! }
+
+    it do
+      expect { user.bump_required_fields_version }.to change { user.required_fields_version }.to(
+        version.id,
+      )
+    end
+  end
 end
diff --git a/spec/requests/application_controller_spec.rb b/spec/requests/application_controller_spec.rb
index 4eaf6b5a1b8..ef52c015f3e 100644
--- a/spec/requests/application_controller_spec.rb
+++ b/spec/requests/application_controller_spec.rb
@@ -256,6 +256,45 @@ RSpec.describe ApplicationController do
     end
   end
 
+  describe "#redirect_to_profile_if_required" do
+    fab!(:user)
+
+    before { sign_in(user) }
+
+    context "when the user is missing required custom fields" do
+      before do
+        Fabricate(:user_field, requirement: "for_all_users")
+        UserRequiredFieldsVersion.create!
+      end
+
+      it "redirects the user to the profile preferences" do
+        get "/hot"
+        expect(response).to redirect_to("/u/#{user.username}/preferences/profile")
+      end
+
+      it "only logs user history once per day" do
+        expect do
+          RateLimiter.enable
+          get "/hot"
+          get "/hot"
+        end.to change { UserHistory.count }.by(1)
+      end
+    end
+
+    context "when the user has filled up all required custom fields" do
+      before do
+        Fabricate(:user_field, requirement: "for_all_users")
+        UserRequiredFieldsVersion.create!
+        user.bump_required_fields_version
+      end
+
+      it "redirects the user to the profile preferences" do
+        get "/hot"
+        expect(response).not_to redirect_to("/u/#{user.username}/preferences/profile")
+      end
+    end
+  end
+
   describe "invalid request params" do
     before do
       @old_logger = Rails.logger
diff --git a/spec/services/user_updater_spec.rb b/spec/services/user_updater_spec.rb
index 65c8a395147..7cddd4a6ef4 100644
--- a/spec/services/user_updater_spec.rb
+++ b/spec/services/user_updater_spec.rb
@@ -602,40 +602,61 @@ RSpec.describe UserUpdater do
       end
     end
 
-    it "logs the action" do
-      user = Fabricate(:user, name: "Billy Bob")
+    context "when updating the name" do
+      it "logs the action" do
+        user = Fabricate(:user, name: "Billy Bob")
 
-      expect do UserUpdater.new(user, user).update(name: "Jim Tom") end.to change {
-        UserHistory.count
-      }.by(1)
+        expect do UserUpdater.new(user, user).update(name: "Jim Tom") end.to change {
+          UserHistory.count
+        }.by(1)
 
-      expect(UserHistory.last.action).to eq(UserHistory.actions[:change_name])
+        expect(UserHistory.last.action).to eq(UserHistory.actions[:change_name])
 
-      expect do UserUpdater.new(user, user).update(name: "JiM TOm") end.to_not change {
-        UserHistory.count
-      }
+        expect do UserUpdater.new(user, user).update(name: "JiM TOm") end.to_not change {
+          UserHistory.count
+        }
 
-      expect do UserUpdater.new(user, user).update(bio_raw: "foo bar") end.to_not change {
-        UserHistory.count
-      }
+        expect do UserUpdater.new(user, user).update(bio_raw: "foo bar") end.to_not change {
+          UserHistory.count
+        }
 
-      user_without_name = Fabricate(:user, name: nil)
+        user_without_name = Fabricate(:user, name: nil)
 
-      expect do
-        UserUpdater.new(user_without_name, user_without_name).update(bio_raw: "foo bar")
-      end.to_not change { UserHistory.count }
+        expect do
+          UserUpdater.new(user_without_name, user_without_name).update(bio_raw: "foo bar")
+        end.to_not change { UserHistory.count }
 
-      expect do
-        UserUpdater.new(user_without_name, user_without_name).update(name: "Jim Tom")
-      end.to change { UserHistory.count }.by(1)
+        expect do
+          UserUpdater.new(user_without_name, user_without_name).update(name: "Jim Tom")
+        end.to change { UserHistory.count }.by(1)
 
-      expect(UserHistory.last.action).to eq(UserHistory.actions[:change_name])
+        expect(UserHistory.last.action).to eq(UserHistory.actions[:change_name])
 
-      expect do UserUpdater.new(user, user).update(name: "") end.to change { UserHistory.count }.by(
-        1,
-      )
+        expect do UserUpdater.new(user, user).update(name: "") end.to change {
+          UserHistory.count
+        }.by(1)
 
-      expect(UserHistory.last.action).to eq(UserHistory.actions[:change_name])
+        expect(UserHistory.last.action).to eq(UserHistory.actions[:change_name])
+      end
+    end
+
+    context "when updating required fields" do
+      it "logs the action" do
+        user = Fabricate(:user)
+        Fabricate(:user_field, name: "favorite_pokemon", requirement: "for_all_users")
+
+        UserRequiredFieldsVersion.create!
+
+        expect do
+          UserUpdater.new(user, user).update(custom_fields: { "favorite_pokemon" => "Mudkip" })
+        end.to change { UserHistory.count }.by(1)
+
+        user.bump_required_fields_version
+
+        expect do
+          UserUpdater.new(user, user).update(custom_fields: { "favorite_pokemon" => "Mudkip" })
+        end.not_to change { UserHistory.count }
+      end
     end
 
     it "clears the homepage_id when the special 'custom' id is chosen" do
diff --git a/spec/system/admin_user_fields_spec.rb b/spec/system/admin_user_fields_spec.rb
index 1bcdb66f0f8..a3c2d5b8017 100644
--- a/spec/system/admin_user_fields_spec.rb
+++ b/spec/system/admin_user_fields_spec.rb
@@ -25,4 +25,38 @@ describe "Admin User Fields", type: :system, js: true do
 
     expect(user_fields_page).to have_text(/Description can't be blank/)
   end
+
+  it "makes sure new required fields are editable after signup" do
+    user_fields_page.visit
+
+    page.find(".user-fields .btn-primary").click
+
+    form = page.find(".user-field")
+    editable_label = I18n.t("admin_js.admin.user_fields.editable.title")
+
+    user_fields_page.choose_requirement("for_all_users")
+
+    expect(form).to have_field(editable_label, checked: true, disabled: true)
+
+    user_fields_page.choose_requirement("optional")
+
+    expect(form).to have_field(editable_label, checked: false, disabled: false)
+  end
+
+  it "requires confirmation when applying required fields retroactively" do
+    user_fields_page.visit
+
+    page.find(".user-fields .btn-primary").click
+
+    form = page.find(".user-field")
+
+    form.find(".user-field-name").fill_in(with: "Favourite Pokémon")
+    form.find(".user-field-desc").fill_in(with: "Hint: It's Mudkip")
+
+    user_fields_page.choose_requirement("for_all_users")
+
+    form.find(".btn-primary").click
+
+    expect(page).to have_text(I18n.t("admin_js.admin.user_fields.requirement.confirmation"))
+  end
 end
diff --git a/spec/system/page_objects/pages/admin_user_fields.rb b/spec/system/page_objects/pages/admin_user_fields.rb
index 3b69ac622fa..37692719c3d 100644
--- a/spec/system/page_objects/pages/admin_user_fields.rb
+++ b/spec/system/page_objects/pages/admin_user_fields.rb
@@ -8,6 +8,12 @@ module PageObjects
         self
       end
 
+      def choose_requirement(requirement)
+        form = page.find(".user-field")
+
+        form.choose(I18n.t("admin_js.admin.user_fields.requirement.#{requirement}.title"))
+      end
+
       def add_field(name: nil, description: nil, requirement: nil, preferences: [])
         page.find(".user-fields .btn-primary").click
 
diff --git a/spec/system/page_objects/pages/user_preferences_profile.rb b/spec/system/page_objects/pages/user_preferences_profile.rb
new file mode 100644
index 00000000000..20955819a76
--- /dev/null
+++ b/spec/system/page_objects/pages/user_preferences_profile.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Pages
+    class UserPreferencesProfile < PageObjects::Pages::Base
+      def visit(user)
+        page.visit("/u/#{user.username}/preferences/profile")
+        self
+      end
+    end
+  end
+end
diff --git a/spec/system/user_page/user_preferences_profile_spec.rb b/spec/system/user_page/user_preferences_profile_spec.rb
new file mode 100644
index 00000000000..f1ad6f8ba3d
--- /dev/null
+++ b/spec/system/user_page/user_preferences_profile_spec.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+describe "User preferences | Profile", type: :system do
+  fab!(:user) { Fabricate(:user, active: true) }
+  let(:user_preferences_profile_page) { PageObjects::Pages::UserPreferencesProfile.new }
+  let(:user_preferences_page) { PageObjects::Pages::UserPreferences.new }
+
+  before { sign_in(user) }
+
+  describe "enforcing required fields" do
+    before do
+      UserRequiredFieldsVersion.create!
+      UserField.create!(
+        field_type: "text",
+        name: "Favourite Pokemon",
+        description: "Hint: It's Mudkip.",
+        requirement: :for_all_users,
+        editable: true,
+      )
+    end
+
+    it "redirects to the profile page to fill up required fields" do
+      visit("/")
+
+      expect(page).to have_current_path("/u/bruce0/preferences/profile")
+
+      expect(page).to have_selector(
+        ".alert-error",
+        text: I18n.t("js.user.preferences.profile.enforced_required_fields"),
+      )
+    end
+
+    it "disables client-side routing while missing required fields" do
+      user_preferences_profile_page.visit(user)
+
+      find("#site-logo").click
+
+      expect(page).to have_current_path("/u/bruce0/preferences/profile")
+    end
+
+    it "allows user to fill up required fields" do
+      user_preferences_profile_page.visit(user)
+
+      find(".user-field-favourite-pokemon input").fill_in(with: "Mudkip")
+      find(".save-button .btn-primary").click
+
+      visit("/")
+
+      expect(page).to have_current_path("/")
+    end
+  end
+end