mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-01-25 20:46:48 +00:00
9be199a6cc
This Spree route conflicts with the one we define:
```
get "/login", to: redirect("/#/login")
```
for whatever reason there are 7 users that managed to hit the Spree one
instead of ours when confirming their signup email. It's not clear to me
though when this `/login?validation=confirmed` is really hit. The
confirmation email link passes a token in the query params and this is
not the case.
The idea is that `GET /login` makes the login modal to show up instead
of Devise's default behaviour (through inheritance) of showing a login
form page. OFN was never prepared to handle this as this bug proofs.
41 lines
1.1 KiB
Ruby
41 lines
1.1 KiB
Ruby
class UserPasswordsController < Spree::UserPasswordsController
|
|
layout 'darkswarm'
|
|
|
|
before_action :set_admin_redirect, only: :edit
|
|
|
|
def create
|
|
render_unconfirmed_response && return if user_unconfirmed?
|
|
|
|
self.resource = resource_class.send_reset_password_instructions(params[resource_name])
|
|
|
|
if resource.errors.empty?
|
|
set_flash_message(:success, :send_instructions) if is_navigational_format?
|
|
respond_with resource, location: main_app.login_path
|
|
else
|
|
respond_to do |format|
|
|
format.html do
|
|
respond_with_navigational(resource) { render :new }
|
|
end
|
|
format.js do
|
|
render json: { error: t('email_not_found') }, status: :not_found
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
def set_admin_redirect
|
|
session["spree_user_return_to"] = params[:return_to] if params[:return_to]
|
|
end
|
|
|
|
def render_unconfirmed_response
|
|
render json: { error: t('email_unconfirmed') }, status: :unauthorized
|
|
end
|
|
|
|
def user_unconfirmed?
|
|
user = Spree::User.find_by(email: params[:spree_user][:email])
|
|
user && !user.confirmed?
|
|
end
|
|
end
|