diff --git a/CHANGELOG.md b/CHANGELOG.md index 0aab7b37..7b90f69b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +# 0.24.2 - 2025-02-15 + +## Fixed + +- Fixed a bug where background jobs to import Immich and Photoprism geolocation data data could not be created by non-admin users. + # 0.24.1 - 2025-02-13 ## Custom map tiles diff --git a/app/controllers/settings/background_jobs_controller.rb b/app/controllers/settings/background_jobs_controller.rb index 8079b7e5..113b1a58 100644 --- a/app/controllers/settings/background_jobs_controller.rb +++ b/app/controllers/settings/background_jobs_controller.rb @@ -2,7 +2,9 @@ class Settings::BackgroundJobsController < ApplicationController before_action :authenticate_user! - before_action :authenticate_admin! + before_action :authenticate_admin!, unless: lambda { + %w[start_immich_import start_photoprism_import].include?(params[:job_name]) + } def index @queues = Sidekiq::Queue.all @@ -13,7 +15,15 @@ class Settings::BackgroundJobsController < ApplicationController flash.now[:notice] = 'Job was successfully created.' - redirect_to settings_background_jobs_path, notice: 'Job was successfully created.' + redirect_path = + case params[:job_name] + when 'start_immich_import', 'start_photoprism_import' + imports_path + else + settings_background_jobs_path + end + + redirect_to redirect_path, notice: 'Job was successfully created.' end def destroy diff --git a/spec/requests/settings/background_jobs_spec.rb b/spec/requests/settings/background_jobs_spec.rb index 616b74d3..1f2a2791 100644 --- a/spec/requests/settings/background_jobs_spec.rb +++ b/spec/requests/settings/background_jobs_spec.rb @@ -17,7 +17,9 @@ RSpec.describe '/settings/background_jobs', type: :request do end context 'when user is authenticated' do - before { sign_in create(:user) } + let(:user) { create(:user, admin: false) } + + before { sign_in user } context 'when user is not an admin' do it 'redirects to root page' do @@ -26,6 +28,32 @@ RSpec.describe '/settings/background_jobs', type: :request do expect(response).to redirect_to(root_url) expect(flash[:notice]).to eq('You are not authorized to perform this action.') end + + context 'when job name is start_immich_import' do + it 'redirects to imports page' do + post settings_background_jobs_url, params: { job_name: 'start_immich_import' } + + expect(response).to redirect_to(imports_url) + end + + it 'enqueues a new job' do + expect do + post settings_background_jobs_url, params: { job_name: 'start_immich_import' } + end.to have_enqueued_job(EnqueueBackgroundJob) + end + end + + context 'when job name is start_photoprism_import' do + it 'redirects to imports page' do + get settings_background_jobs_url, params: { job_name: 'start_photoprism_import' } + end + + it 'enqueues a new job' do + expect do + post settings_background_jobs_url, params: { job_name: 'start_photoprism_import' } + end.to have_enqueued_job(EnqueueBackgroundJob) + end + end end context 'when user is an admin' do diff --git a/spec/requests/settings/users_spec.rb b/spec/requests/settings/users_spec.rb index d2cc7806..ddec5949 100644 --- a/spec/requests/settings/users_spec.rb +++ b/spec/requests/settings/users_spec.rb @@ -10,7 +10,7 @@ RSpec.describe '/settings/users', type: :request do it 'redirects to sign in page' do post settings_users_url, params: { user: valid_attributes } - expect(response).to redirect_to(new_user_session_url) + expect(response).to redirect_to(root_url) end end