~cytrogen/masto-fe

f20698000f77e05634c49d1632051f172b4845a8 — Eugen Rochko 2 years ago ec59166
Fix always redirecting to onboarding in web UI (#25396)

M app/controllers/auth/confirmations_controller.rb => app/controllers/auth/confirmations_controller.rb +3 -1
@@ 83,8 83,10 @@ class Auth::ConfirmationsController < Devise::ConfirmationsController
  def after_confirmation_path_for(_resource_name, user)
    if user.created_by_application && truthy_param?(:redirect_to_app)
      user.created_by_application.confirmation_redirect_uri
    elsif user_signed_in?
      web_url('start')
    else
      super
      new_user_session_path
    end
  end
end

M app/javascript/mastodon/features/ui/index.jsx => app/javascript/mastodon/features/ui/index.jsx +0 -5
@@ 393,11 393,6 @@ class UI extends PureComponent {
      navigator.serviceWorker.addEventListener('message', this.handleServiceWorkerPostMessage);
    }

    // On first launch, redirect to the follow recommendations page
    if (signedIn && this.props.firstLaunch) {
      this.context.router.history.replace('/start');
    }

    if (signedIn) {
      this.props.dispatch(fetchMarkers());
      this.props.dispatch(expandHomeTimeline());