#2203: Allow using REST API with token

This commit is contained in:
Jyri-Petteri Paloposki 2019-05-04 20:31:32 +03:00
parent ec59f10af8
commit d3ba80c84e
4 changed files with 7 additions and 7 deletions

View file

@ -4,8 +4,8 @@ class ContextsController < ApplicationController
before_action :init, :except => [:index, :create, :destroy, :order] before_action :init, :except => [:index, :create, :destroy, :order]
before_action :set_context_from_params, :only => [:update, :destroy] before_action :set_context_from_params, :only => [:update, :destroy]
skip_before_action :login_required, :only => [:index] skip_before_action :login_required, :only => [:index, :show]
prepend_before_action :login_or_feed_token_required, :only => [:index] prepend_before_action :login_or_feed_token_required, :only => [:index, :show]
def index def index
@all_contexts = current_user.contexts @all_contexts = current_user.contexts

View file

@ -4,8 +4,8 @@ class ProjectsController < ApplicationController
before_action :set_source_view before_action :set_source_view
before_action :set_project_from_params, :only => [:update, :destroy, :show, :edit, :set_reviewed] before_action :set_project_from_params, :only => [:update, :destroy, :show, :edit, :set_reviewed]
before_action :default_context_filter, :only => [:create, :update] before_action :default_context_filter, :only => [:create, :update]
skip_before_action :login_required, :only => [:index] skip_before_action :login_required, :only => [:index, :show]
prepend_before_action :login_or_feed_token_required, :only => [:index] prepend_before_action :login_or_feed_token_required, :only => [:index, :show]
def index def index
@source_view = params['_source_view'] || 'project_list' @source_view = params['_source_view'] || 'project_list'

View file

@ -1,7 +1,7 @@
class TodosController < ApplicationController class TodosController < ApplicationController
skip_before_action :login_required, :only => [:index, :tag] skip_before_action :login_required, :only => [:index, :tag, :list_deferred, :show, :list_hidden, :done]
prepend_before_action :login_or_feed_token_required, :only => [:index, :tag] prepend_before_action :login_or_feed_token_required, :only => [:index, :tag, :list_deferred, :show, :list_hidden, :done]
append_before_action :find_and_activate_ready, :only => [:index, :list_deferred] append_before_action :find_and_activate_ready, :only => [:index, :list_deferred]
protect_from_forgery :except => :check_deferred protect_from_forgery :except => :check_deferred

View file

@ -71,7 +71,7 @@ module LoginSystem
end end
def login_or_feed_token_required def login_or_feed_token_required
if ['rss', 'atom', 'txt', 'ics'].include?(params[:format]) if ['rss', 'atom', 'txt', 'ics', 'xml'].include?(params[:format])
if user = User.where(:token => params[:token]).first if user = User.where(:token => params[:token]).first
set_current_user(user) set_current_user(user)
return true return true