forked from External/greenlight
		
	fix logout route to not conflict with BBB
This commit is contained in:
		@@ -1,16 +1,16 @@
 | 
				
			|||||||
class SessionsController < ApplicationController
 | 
					class SessionsController < ApplicationController
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # GET /login
 | 
					  # GET /users/login
 | 
				
			||||||
  def new
 | 
					  def new
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # GET /logout
 | 
					  # GET /users/logout
 | 
				
			||||||
  def destroy
 | 
					  def destroy
 | 
				
			||||||
    logout
 | 
					    logout
 | 
				
			||||||
    redirect_to root_path
 | 
					    redirect_to root_path
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # POST /login
 | 
					  # POST /users/login
 | 
				
			||||||
  def create
 | 
					  def create
 | 
				
			||||||
    user = User.find_by(email: session_params[:email])
 | 
					    user = User.find_by(email: session_params[:email])
 | 
				
			||||||
    if user && user.authenticate(session_params[:password])
 | 
					    if user && user.authenticate(session_params[:password])
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -22,17 +22,21 @@ Rails.application.routes.draw do
 | 
				
			|||||||
    end
 | 
					    end
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # User resources.
 | 
					  # Signup routes.
 | 
				
			||||||
  get '/signup', to: 'users#new', as: :signup
 | 
					  get '/signup', to: 'users#new', as: :signup
 | 
				
			||||||
  post '/signup', to: 'users#create', as: :create_user
 | 
					  post '/signup', to: 'users#create', as: :create_user
 | 
				
			||||||
  get '/users/:user_uid/edit', to: 'users#edit', as: :edit_user
 | 
					 | 
				
			||||||
  patch '/users/:user_uid/edit', to: 'users#update', as: :update_user
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # Handles login of greenlight provider accounts.
 | 
					  # User resources.
 | 
				
			||||||
  post '/login',  to: 'sessions#create', as: :create_session
 | 
					  scope '/users' do
 | 
				
			||||||
 | 
					    get '/:user_uid/edit', to: 'users#edit', as: :edit_user
 | 
				
			||||||
 | 
					    patch '/:user_uid/edit', to: 'users#update', as: :update_user
 | 
				
			||||||
  
 | 
					  
 | 
				
			||||||
  # Log the user out of the session.
 | 
					    # Handles login of greenlight provider accounts.
 | 
				
			||||||
  get '/logout', to: 'sessions#destroy'
 | 
					    post '/login',  to: 'sessions#create', as: :create_session
 | 
				
			||||||
 | 
					  
 | 
				
			||||||
 | 
					    # Log the user out of the session.
 | 
				
			||||||
 | 
					    get '/logout', to: 'sessions#destroy'
 | 
				
			||||||
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # Handles launches from a trusted launcher.
 | 
					  # Handles launches from a trusted launcher.
 | 
				
			||||||
  post '/launch', to: 'sessions#launch'
 | 
					  post '/launch', to: 'sessions#launch'
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user