Skip to content
Snippets Groups Projects
Commit 11f99bf1 authored by luandalmazo's avatar luandalmazo Committed by ahcv19
Browse files

Issue #10: FIX email confirmation

parent b29a20bd
No related branches found
No related tags found
2 merge requests!17Curatorship and Gamification done,!9Issue/10 fix email confirmation task
Pipeline #30074 failed
......@@ -66,13 +66,10 @@ require 'open-uri'
#in case of the user is not confirmed, find the user and send an email confirmation
else
@user = User.find_by_email(params[:email])
UserMailer.email_confirmation(@user).deliver_now
return render_create_error_not_confirmed
end
else
puts("Usuário não encontrado")
return render_create_error_bad_credentials
end
......@@ -82,7 +79,7 @@ require 'open-uri'
render json: {
success: false,
errors: [ I18n.t("devise.failure.unconfirmed")],
}, status: 401
}, status: 417
end
......@@ -90,7 +87,7 @@ require 'open-uri'
render json: {
success: false,
errors: [ I18n.t("devise.sessions.banished")]
}, status: 401
}, status: 406
end
def render_create_error_blocked
......@@ -98,7 +95,7 @@ require 'open-uri'
success: false,
errors: [ I18n.t("devise.sessions.blocked")],
avaliable_at: @resource.reactivated_at
}, status: 401
}, status: 406
end
def reactivate_user?
......
......@@ -139,6 +139,7 @@ class User < ApplicationRecord
after_create :default_role
before_save :verify_teacher_id
after_save :verify_dspace_info
before_create :send_email_confirmation
before_destroy :delete_index
after_update :create_actions
......@@ -167,6 +168,10 @@ class User < ApplicationRecord
# don't versionate frequently changed fields
has_paper_trail ignore: [:tokens, :sign_in_count, :current_sign_in_at, :last_sign_in_at]
def send_email_confirmation
UserMailer.email_confirmation(self).deliver_now
end
def email_activate
self.email_confirmed = true
self.confirm_token = nil
......
......@@ -6,6 +6,7 @@ namespace :access do
User.all.each do |user|
if user.created_at < base_date
user.update_attribute(:email_confirmed, true)
user.update_attribute(:confirmed_at, Time.now)
end
end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment