Commit 9f81e3ab by liyijie

Fix valid? logic

parent 692eab74
...@@ -55,7 +55,7 @@ module RailsApiAuthentication ...@@ -55,7 +55,7 @@ module RailsApiAuthentication
def register(name, password, attrs={}) def register(name, password, attrs={})
raise(UserError.new(401, '-1', 'password is blank')) if password.blank? raise(UserError.new(401, '-1', 'password is blank')) if password.blank?
raise(UserError.new(401, '-1', 'valid token is not correct')) if @valid_key.present? && !valid?(name, attrs[@valid_key]) raise(UserError.new(401, '-1', 'valid token is not correct')) unless valid?(name, attrs[@valid_key])
self.create!({@auth_key => name, @auth_password => generate_password(password)}.merge attrs) self.create!({@auth_key => name, @auth_password => generate_password(password)}.merge attrs)
rescue ActiveRecord::RecordInvalid => e rescue ActiveRecord::RecordInvalid => e
raise UserError.new(401, '-1', e.message) raise UserError.new(401, '-1', e.message)
...@@ -81,7 +81,7 @@ module RailsApiAuthentication ...@@ -81,7 +81,7 @@ module RailsApiAuthentication
end end
def valid? name, valid_code def valid? name, valid_code
valid_code == $redis.get(name) @valid_key.blank? || (valid_code.present? && valid_code == $redis.get(name))
end end
def auth(request) def auth(request)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment