Merge pull request #52 from alces-software/feature/login-redirection

Login redirection adjustments

Author: atoghill

app/controllers/sessions_controller.rb

@@ -5,10 +5,10 @@ def create
     user = User.find_by(username: params[:session][:username])
     if User.authenticate(params[:session][:username], params[:session][:password])
       sign_in(user)
-      redirect_to cluster_path
+      redirect_back(fallback_location: cluster_path)
     else
       flash[:danger] = 'Invalid username or password'
-      redirect_to login_path
+      redirect_back(fallback_location: login_path)
     end
   end
 

config/routes.rb

@@ -31,13 +31,17 @@
 
     delete  '/logout',  to: 'sessions#destroy'
 
+    match '/login' => redirect('/'), via: :get
+
     root 'cluster#index'
   end
 
   constraints Clearance::Constraints::SignedOut.new do
     get     '/login',   to: 'sessions#new'
     post    '/login',   to: 'sessions#create'
 
+    match '*path', to: 'sessions#new', via: :get
+
     root 'sessions#new'
   end
 end