From 328f806d39720d938d0892a06d82cac10689af08 Mon Sep 17 00:00:00 2001 From: benji Date: Wed, 7 Oct 2015 15:06:01 +0200 Subject: [PATCH] Change token login to get --- app/controllers/welcome_controller.rb | 10 +++++++--- config/routes.rb | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index b351b34..d10d0e1 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -5,8 +5,12 @@ class WelcomeController < ApplicationController end def token_sign_in - return head(:unauthorized) unless params[:token] == Rails.application.secrets.koelkast_token - koelkast = User.find_by(name: "koelkast") - sign_in_and_redirect koelkast + if user_signed_in? || params[:token] == Rails.application.secrets.koelkast_token + redirect_to root_path + return + else + koelkast = User.find_by(name: "koelkast") + sign_in_and_redirect koelkast + end end end diff --git a/config/routes.rb b/config/routes.rb index 2b90cc8..788146c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,7 +3,7 @@ Rails.application.routes.draw do devise_scope :user do get 'sign_out', to: 'devise/sessions#destroy', as: :destroy_user_session - post 'sign_in', to: 'welcome#token_sign_in' + get 'sign_in', to: 'welcome#token_sign_in' unauthenticated :user do root to: 'welcome#index' end