From 4c94c8518a8291ce600deb488945524510507e5c Mon Sep 17 00:00:00 2001 From: Thorsten Eckel Date: Mon, 22 Jun 2015 12:56:20 +0200 Subject: [PATCH] - Removed URL based token auth for iCal feature. - Enabled http basic auth fallback auth. --- app/controllers/ical_tickets_controller.rb | 4 ++-- config/routes/ical_tickets.rb | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/ical_tickets_controller.rb b/app/controllers/ical_tickets_controller.rb index 47993c1d5..49069fce5 100644 --- a/app/controllers/ical_tickets_controller.rb +++ b/app/controllers/ical_tickets_controller.rb @@ -3,9 +3,9 @@ require 'icalendar' class IcalTicketsController < ApplicationController - before_action { authentication_check_action_token 'iCal' } + before_action { authentication_check( { basic_auth_promt: true } ) } - # @path [GET] /ical/tickets_all/:action_token + # @path [GET] /ical/tickets/:action_token # # @summary Returns an iCal file with all tickets (open, new, pending, esclation) as events. # diff --git a/config/routes/ical_tickets.rb b/config/routes/ical_tickets.rb index 324c30007..38c24f043 100644 --- a/config/routes/ical_tickets.rb +++ b/config/routes/ical_tickets.rb @@ -2,8 +2,8 @@ Zammad::Application.routes.draw do api_path = Rails.configuration.api_path # ical ticket - match api_path + '/ical/tickets/:action_token', to: 'ical_tickets#all', via: :get - match api_path + '/ical/tickets_new_open/:action_token', to: 'ical_tickets#new_open', via: :get - match api_path + '/ical/tickets_pending/:action_token', to: 'ical_tickets#pending', via: :get - match api_path + '/ical/tickets_escalation/:action_token', to: 'ical_tickets#escalation', via: :get + match api_path + '/ical/tickets', to: 'ical_tickets#all', via: :get + match api_path + '/ical/tickets_new_open', to: 'ical_tickets#new_open', via: :get + match api_path + '/ical/tickets_pending', to: 'ical_tickets#pending', via: :get + match api_path + '/ical/tickets_escalation', to: 'ical_tickets#escalation', via: :get end