bike/BikeShed-1
1
0
Fork 0
mirror of https://github.com/fspc/BikeShed-1.git synced 2025-02-28 08:43:23 -05:00
Code Issues Projects Releases Wiki Activity

Should authenticate by user username, not email

Browse Source
This commit is contained in:
Jason Denney 2014-03-09 22:48:35 -04:00
parent e2f442889e
commit 64e907b6f7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/v1/base_controller.rb
View File

@ -6,7 +6,7 @@ class Api::V1::BaseController < ActionController::Base
private
def authenticate_user
if params[:username]
user = User.find_for_database_authentication( :email => params[:username] )
user = User.find_for_database_authentication( :username => params[:username] )
@current_user = user if user && user.valid_password?( params[:password] )
if @current_user.nil?

2
spec/support/api_test_helpers.rb
View File

@ -1,5 +1,5 @@
module ApiTestHelpers
def api_submit_json(user, json_hash)
json_hash.merge({username: user.email, password: user.password})
json_hash.merge({username: user.username, password: user.password})
end
end