mirror of https://github.com/Siphonay/mastodon
Fix always redirecting to onboarding in web UI (#25396)
This commit is contained in:
parent
ec59166844
commit
f20698000f
|
@ -83,8 +83,10 @@ class Auth::ConfirmationsController < Devise::ConfirmationsController
|
||||||
def after_confirmation_path_for(_resource_name, user)
|
def after_confirmation_path_for(_resource_name, user)
|
||||||
if user.created_by_application && truthy_param?(:redirect_to_app)
|
if user.created_by_application && truthy_param?(:redirect_to_app)
|
||||||
user.created_by_application.confirmation_redirect_uri
|
user.created_by_application.confirmation_redirect_uri
|
||||||
|
elsif user_signed_in?
|
||||||
|
web_url('start')
|
||||||
else
|
else
|
||||||
super
|
new_user_session_path
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -393,11 +393,6 @@ class UI extends PureComponent {
|
||||||
navigator.serviceWorker.addEventListener('message', this.handleServiceWorkerPostMessage);
|
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) {
|
if (signedIn) {
|
||||||
this.props.dispatch(fetchMarkers());
|
this.props.dispatch(fetchMarkers());
|
||||||
this.props.dispatch(expandHomeTimeline());
|
this.props.dispatch(expandHomeTimeline());
|
||||||
|
|
Loading…
Reference in New Issue