Commit ddf4d010 by ivan Lan

Change some code of UserError.new from 401 to 400

parent 86cc5c41
...@@ -12,7 +12,7 @@ module RailsApiAuthentication ...@@ -12,7 +12,7 @@ module RailsApiAuthentication
end end
def update_password password def update_password password
raise(UserError.new(401, '-1', 'password is blank')) if password.blank? raise(UserError.new(400, '-1', 'password is blank')) if password.blank?
auth_password = self.class.auth_password auth_password = self.class.auth_password
self.update(auth_password => self.class.send(:generate_password, password)) self.update(auth_password => self.class.send(:generate_password, password))
end end
...@@ -61,7 +61,7 @@ module RailsApiAuthentication ...@@ -61,7 +61,7 @@ module RailsApiAuthentication
raise(UserError.new(401, '-1', 'Unauthorized')) if user.nil? raise(UserError.new(401, '-1', 'Unauthorized')) if user.nil?
AuthToken.create(self, oauth_params(params).merge({ oid: user.id }) ) AuthToken.create(self, oauth_params(params).merge({ oid: user.id }) )
rescue ActiveRecord::RecordInvalid => e rescue ActiveRecord::RecordInvalid => e
raise UserError.new(401, '-1', e.message) raise UserError.new(400, '-1', e.message)
end end
def login(name, password, params={}) def login(name, password, params={})
...@@ -102,13 +102,13 @@ module RailsApiAuthentication ...@@ -102,13 +102,13 @@ module RailsApiAuthentication
end end
def register(name, password, attrs={}) def register(name, password, attrs={})
raise(UserError.new(401, '-1', 'password is blank')) if password.blank? raise(UserError.new(400, '-1', 'password is blank')) if password.blank?
valid! name, attrs.delete(@valid_key) valid! name, attrs.delete(@valid_key)
user = self.create!({@auth_key => name, @auth_password => generate_password(password)}) user = self.create!({@auth_key => name, @auth_password => generate_password(password)})
user.token = AuthToken.create(self, oauth_params(attrs).merge({ oid: user.id }) ).token user.token = AuthToken.create(self, oauth_params(attrs).merge({ oid: user.id }) ).token
user user
rescue ActiveRecord::RecordInvalid => e rescue ActiveRecord::RecordInvalid => e
raise UserError.new(401, '-1', e.message) raise UserError.new(400, '-1', e.message)
end end
def register_with(attrs={}) def register_with(attrs={})
......
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