forked from External/greenlight
start writing tests
This commit is contained in:
@ -86,7 +86,8 @@ class MeetingsController < ApplicationController
|
||||
private
|
||||
|
||||
def meeting_params(room)
|
||||
params.require(:meeting).permit(:name).merge!(room_id: room.id)
|
||||
params.require(:meeting).permit(:name).merge!(room: room)
|
||||
#params.require(:meeting).permit(:name).merge!(room_id: room.id)
|
||||
end
|
||||
|
||||
def default_meeting_options
|
||||
|
@ -6,17 +6,35 @@ class SessionsController < ApplicationController
|
||||
|
||||
# GET /logout
|
||||
def destroy
|
||||
logout
|
||||
logout if current_user
|
||||
end
|
||||
|
||||
# POST /login
|
||||
def create
|
||||
user = User.find_by(email: session_params[:email])
|
||||
if user && user.authenticate(session_params[:password])
|
||||
login(user)
|
||||
else
|
||||
# Login unsuccessful, display error message.
|
||||
|
||||
render :new
|
||||
end
|
||||
end
|
||||
|
||||
# GET/POST /auth/:provider/callback
|
||||
def create
|
||||
def omniauth_session
|
||||
user = User.from_omniauth(request.env['omniauth.auth'])
|
||||
login(user)
|
||||
end
|
||||
|
||||
# POST /auth/failure
|
||||
def fail
|
||||
redirect_to root_path
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def session_params
|
||||
params.require(:session).permit(:email, :password)
|
||||
end
|
||||
end
|
||||
|
@ -1,2 +1,23 @@
|
||||
class UsersController < ApplicationController
|
||||
|
||||
# GET /signup
|
||||
def new
|
||||
@user = User.new
|
||||
end
|
||||
|
||||
# POST /signup
|
||||
def create
|
||||
user = User.new(user_params)
|
||||
if user.save
|
||||
login(user)
|
||||
else
|
||||
render :new
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def user_params
|
||||
params.require(:user).permit(:name, :email, :password, :password_confirmation)
|
||||
end
|
||||
end
|
Reference in New Issue
Block a user