VRFS-3681 reverting edits prior to develop branch merge

This commit is contained in:
Jonathan Kolyer 2015-11-08 22:24:31 +00:00
parent d7a6bdaaba
commit 57314a9b1c
3 changed files with 2 additions and 40 deletions

View File

@ -2171,7 +2171,7 @@ module JamRuby
end
end
def synchronize_all(options)
def synchronize_all(options)
importers = []
count = 0

View File

@ -2,38 +2,6 @@ class ApiAuthsController < ApiController
respond_to :json
def register
user = UserManager.new.signup(remote_ip: request.remote_ip,
first_name: params[:first_name],
last_name: params[:last_name],
email: params[:email],
password: params[:password],
password_confirmation: params[:password],
terms_of_service: true,
instruments: [],
birth_date: nil,
location: nil,
musician: false,
skip_recaptcha: true,
invited_user: nil,
fb_signup: nil,
signup_confirm_url: ApplicationHelper.base_uri(request) + "/confirm",
affiliate_referral_id: nil,
affiliate_partner: nil)
if user.nil?
render :json => {}, :status => 422
else
@session_only_cookie = false
render :json => {
first_name: user.first_name,
last_name: user.last_name,
email: user.email
}, :status => :ok
end
end
def login
user = User.authenticate(params[:email], params[:password])
@ -48,12 +16,7 @@ class ApiAuthsController < ApiController
complete_sign_in(user, redirect=false)
render :json => {
first_name: user.first_name,
last_name: user.last_name,
photo_url: user.photo_url,
email: user.email
}, :status => :ok
render :json => {}, :status => :ok
end
end
end

View File

@ -195,7 +195,6 @@ SampleApp::Application.routes.draw do
scope '/api' do
match '/auths/login' => 'api_auths#login', :via => :post
match '/auths/register' => 'api_auths#register', :via => :post
# music sessions
match '/sessions/:id/participants/legacy' => 'api_music_sessions#participant_create_legacy', :via => :post # can be removed when new Create Session comes in