merge upstream-v4.2.8 branch into main

app/controllers/application_controller.rb

@@ -34,7 +34,6 @@ class ApplicationController < ActionController::Base
   helper_method :limited_federation_mode?
   helper_method :body_class_string
   helper_method :skip_csrf_meta_tags?
-  helper_method :sso_redirect
 
   rescue_from ActionController::ParameterMissing, Paperclip::AdapterRegistry::NoHandlerError, with: :bad_request
   rescue_from Mastodon::NotPermittedError, with: :forbidden
@@ -88,7 +87,11 @@ def skip_csrf_meta_tags?
   end
 
   def after_sign_out_path_for(_resource_or_scope)
-    root_path
+    if ENV['OMNIAUTH_ONLY'] == 'true' && ENV['OIDC_ENABLED'] == 'true'
+      '/auth/auth/openid_connect/logout'
+    else
+      new_user_session_path
+    end
   end
 
   protected
@@ -145,10 +148,6 @@ def omniauth_only?
     ENV['OMNIAUTH_ONLY'] == 'true'
   end
 
-  def sso_redirect
-    "/auth/auth/#{Devise.omniauth_providers[0]}" if ENV['OMNIAUTH_ONLY'] == 'true' && Devise.omniauth_providers.length == 1
-  end
-
   def sso_account_settings
     ENV.fetch('SSO_ACCOUNT_SETTINGS', nil)
   end

app/controllers/auth/sessions_controller.rb

@@ -11,9 +11,6 @@ class Auth::SessionsController < Devise::SessionsController
   skip_before_action :require_functional!
   skip_before_action :update_user_sign_in
 
-  # Allow any client to call /auth/sign_out via a delete call
-  skip_before_action :verify_authenticity_token, only: [:destroy]
-
   prepend_before_action :check_suspicious!, only: [:create]
 
   include TwoFactorAuthenticationConcern

app/javascript/mastodon/components/column_back_button.jsx

@@ -4,7 +4,7 @@ import { createPortal } from 'react-dom';
 
 import { FormattedMessage } from 'react-intl';
 
-import { Icon } from 'mastodon/components/icon';
+import { Icon }  from 'mastodon/components/icon';
 
 export default class ColumnBackButton extends PureComponent {
 
@@ -30,7 +30,7 @@ export default class ColumnBackButton extends PureComponent {
     }
   };
 
-  render() {
+  render () {
     const { multiColumn } = this.props;
 
     const component = (

app/javascript/mastodon/containers/status_container.jsx

@@ -77,7 +77,7 @@ const makeMapStateToProps = () => {
 
 const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
 
-  onReply(status, router) {
+  onReply (status, router) {
     dispatch((_, getState) => {
       let state = getState();
 
@@ -87,56 +87,55 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
           modalProps: {
             message: intl.formatMessage(messages.replyMessage),
             confirm: intl.formatMessage(messages.replyConfirm),
-            onConfirm: () => dispatch(replyCompose(status, router))
-          },
+            onConfirm: () => dispatch(replyCompose(status, router)) },
         }));
       } else {
         dispatch(replyCompose(status, router));
       }
     });
   },
 
-  onModalReblog(status, privacy) {
+  onModalReblog (status, privacy) {
     if (status.get('reblogged')) {
       dispatch(unreblog(status));
     } else {
       dispatch(reblog(status, privacy));
     }
   },
 
-  onReblog(status, e) {
+  onReblog (status, e) {
     if ((e && e.shiftKey) || !boostModal) {
       this.onModalReblog(status);
     } else {
       dispatch(initBoostModal({ status, onReblog: this.onModalReblog }));
     }
   },
 
-  onFavourite(status) {
+  onFavourite (status) {
     if (status.get('favourited')) {
       dispatch(unfavourite(status));
     } else {
       dispatch(favourite(status));
     }
   },
 
-  onBookmark(status) {
+  onBookmark (status) {
     if (status.get('bookmarked')) {
       dispatch(unbookmark(status));
     } else {
       dispatch(bookmark(status));
     }
   },
 
-  onPin(status) {
+  onPin (status) {
     if (status.get('pinned')) {
       dispatch(unpin(status));
     } else {
       dispatch(pin(status));
     }
   },
 
-  onEmbed(status) {
+  onEmbed (status) {
     dispatch(openModal({
       modalType: 'EMBED',
       modalProps: {
@@ -146,7 +145,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     }));
   },
 
-  onDelete(status, history, withRedraft = false) {
+  onDelete (status, history, withRedraft = false) {
     if (!deleteModal) {
       dispatch(deleteStatus(status.get('id'), history, withRedraft));
     } else {
@@ -161,7 +160,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     }
   },
 
-  onEdit(status, history) {
+  onEdit (status, history) {
     dispatch((_, getState) => {
       let state = getState();
       if (state.getIn(['compose', 'text']).trim().length !== 0) {
@@ -179,82 +178,82 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     });
   },
 
-  onTranslate(status) {
+  onTranslate (status) {
     if (status.get('translation')) {
       dispatch(undoStatusTranslation(status.get('id'), status.get('poll')));
     } else {
       dispatch(translateStatus(status.get('id')));
     }
   },
 
-  onDirect(account, router) {
+  onDirect (account, router) {
     dispatch(directCompose(account, router));
   },
 
-  onMention(account, router) {
+  onMention (account, router) {
     dispatch(mentionCompose(account, router));
   },
 
-  onOpenMedia(statusId, media, index, lang) {
+  onOpenMedia (statusId, media, index, lang) {
     dispatch(openModal({
       modalType: 'MEDIA',
       modalProps: { statusId, media, index, lang },
     }));
   },
 
-  onOpenVideo(statusId, media, lang, options) {
+  onOpenVideo (statusId, media, lang, options) {
     dispatch(openModal({
       modalType: 'VIDEO',
       modalProps: { statusId, media, lang, options },
     }));
   },
 
-  onBlock(status) {
+  onBlock (status) {
     const account = status.get('account');
     dispatch(initBlockModal(account));
   },
 
-  onUnblock(account) {
+  onUnblock (account) {
     dispatch(unblockAccount(account.get('id')));
   },
 
-  onReport(status) {
+  onReport (status) {
     dispatch(initReport(status.get('account'), status));
   },
 
-  onAddFilter(status) {
+  onAddFilter (status) {
     dispatch(initAddFilter(status, { contextType }));
   },
 
-  onMute(account) {
+  onMute (account) {
     dispatch(initMuteModal(account));
   },
 
-  onUnmute(account) {
+  onUnmute (account) {
     dispatch(unmuteAccount(account.get('id')));
   },
 
-  onMuteConversation(status) {
+  onMuteConversation (status) {
     if (status.get('muted')) {
       dispatch(unmuteStatus(status.get('id')));
     } else {
       dispatch(muteStatus(status.get('id')));
     }
   },
 
-  onToggleHidden(status) {
+  onToggleHidden (status) {
     if (status.get('hidden')) {
       dispatch(revealStatus(status.get('id')));
     } else {
       dispatch(hideStatus(status.get('id')));
     }
   },
 
-  onToggleCollapsed(status, isCollapsed) {
+  onToggleCollapsed (status, isCollapsed) {
     dispatch(toggleStatusCollapse(status.get('id'), isCollapsed));
   },
 
-  onBlockDomain(domain) {
+  onBlockDomain (domain) {
     dispatch(openModal({
       modalType: 'CONFIRM',
       modalProps: {
@@ -265,15 +264,15 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     }));
   },
 
-  onUnblockDomain(domain) {
+  onUnblockDomain (domain) {
     dispatch(unblockDomain(domain));
   },
 
-  deployPictureInPicture(status, type, mediaProps) {
+  deployPictureInPicture (status, type, mediaProps) {
     dispatch(deployPictureInPicture(status.get('id'), status.getIn(['account', 'id']), type, mediaProps));
   },
 
-  onInteractionModal(type, status) {
+  onInteractionModal (type, status) {
     dispatch(openModal({
       modalType: 'INTERACTION',
       modalProps: {