lino.jorzick/greenlight
1
0
Fork 0
forked from External/greenlight
Code Issues Pull Requests Projects Releases Wiki Activity

GRN2-xx: Restructured email verification and password reset (#1444)

Browse Source 
* Restructured email verification and password reset

* Fixed issue with password reset

Co-authored-by: Jesus Federico <jesus@123it.ca>
This commit is contained in:
Ahmad Farhat
2020-04-29 17:56:46 -04:00
committed by GitHub
parent 8f3ba8a038
commit 28302107bd
10 changed files with 46 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app/models/user.rb
View File

@ -21,7 +21,6 @@ require 'bbb_api'
class User < ApplicationRecord
include Deleteable
attr_accessor :reset_token, :activation_token
after_create :setup_user
before_save { email.try(:downcase!) }
@ -110,24 +109,28 @@ class User < ApplicationRecord
# Activates an account and initialize a users main room
def activate
update_attributes(email_verified: true, activated_at: Time.zone.now)
update_attributes(email_verified: true, activated_at: Time.zone.now, activation_digest: nil)
end
def activated?
Rails.configuration.enable_email_verification ? email_verified : true
end
# Sets the password reset attributes.
def create_reset_digest
self.reset_token = User.new_token
update_attributes(reset_digest: User.digest(reset_token), reset_sent_at: Time.zone.now)
def self.hash_token(token)
Digest::SHA2.hexdigest(token)
end
# Returns true if the given token matches the digest.
def authenticated?(attribute, token)
digest = send("#{attribute}_digest")
return false if digest.nil?
digest == Digest::SHA256.base64digest(token)
# Sets the password reset attributes.
def create_reset_digest
new_token = SecureRandom.urlsafe_base64
update_attributes(reset_digest: User.hash_token(new_token), reset_sent_at: Time.zone.now)
new_token
end
def create_activation_token
new_token = SecureRandom.urlsafe_base64
update_attributes(activation_digest: User.hash_token(new_token))
new_token
end
# Return true if password reset link expires
@ -158,11 +161,6 @@ class User < ApplicationRecord
social_uid.nil?
end
def create_activation_token
self.activation_token = User.new_token
update_attributes(activation_digest: User.digest(activation_token))
end
def admin_of?(user, permission)
has_correct_permission = highest_priority_role.get_permission(permission) && id != user.id
@ -171,15 +169,6 @@ class User < ApplicationRecord
has_correct_permission && provider == user.provider && !user.has_role?(:super_admin)
end
def self.digest(string)
Digest::SHA256.base64digest(string)
end
# Returns a random token.
def self.new_token
SecureRandom.urlsafe_base64
end
# role functions
def highest_priority_role
roles.min_by(&:priority)