From bc8647f5e4359c07ed5bfd1dd0d4eda4f5265b96 Mon Sep 17 00:00:00 2001 From: Eugene Burmakin Date: Sat, 25 May 2024 14:08:40 +0200 Subject: [PATCH] Fix the API key authentication for Owntracks points --- app/controllers/api/v1/owntracks/points_controller.rb | 2 +- .../v1/owntracks/{points_controller.rb => points_spec.rb} | 6 +++--- swagger/v1/swagger.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename spec/requests/api/v1/owntracks/{points_controller.rb => points_spec.rb} (78%) diff --git a/app/controllers/api/v1/owntracks/points_controller.rb b/app/controllers/api/v1/owntracks/points_controller.rb index 2e871c38..b03b3425 100644 --- a/app/controllers/api/v1/owntracks/points_controller.rb +++ b/app/controllers/api/v1/owntracks/points_controller.rb @@ -5,7 +5,7 @@ class Api::V1::Owntracks::PointsController < ApplicationController before_action :authenticate_api_key def create - Owntracks::PointCreatingJob.perform_later(point_params, current_user.id) + Owntracks::PointCreatingJob.perform_later(point_params, current_api_user.id) render json: {}, status: :ok end diff --git a/spec/requests/api/v1/owntracks/points_controller.rb b/spec/requests/api/v1/owntracks/points_spec.rb similarity index 78% rename from spec/requests/api/v1/owntracks/points_controller.rb rename to spec/requests/api/v1/owntracks/points_spec.rb index 73e669d4..e99b6c6f 100644 --- a/spec/requests/api/v1/owntracks/points_controller.rb +++ b/spec/requests/api/v1/owntracks/points_spec.rb @@ -12,7 +12,7 @@ RSpec.describe 'Api::V1::Owntracks::Points', type: :request do context 'with invalid api key' do it 'returns http unauthorized' do - post api_v1_points_path, params: params + post api_v1_owntracks_points_path, params: params expect(response).to have_http_status(:unauthorized) end @@ -20,14 +20,14 @@ RSpec.describe 'Api::V1::Owntracks::Points', type: :request do context 'with valid api key' do it 'returns http success' do - post api_v1_points_path(api_key: user.api_key), params: params + post api_v1_owntracks_points_path(api_key: user.api_key), params: params expect(response).to have_http_status(:success) end it 'enqueues a job' do expect do - post api_v1_points_path(api_key: user.api_key), params: params + post api_v1_owntracks_points_path(api_key: user.api_key), params: params end.to have_enqueued_job(Owntracks::PointCreatingJob) end end diff --git a/swagger/v1/swagger.yaml b/swagger/v1/swagger.yaml index c7e4da1d..dba948ae 100644 --- a/swagger/v1/swagger.yaml +++ b/swagger/v1/swagger.yaml @@ -180,7 +180,7 @@ paths: lat: 52.502397 lon: 13.356718 tid: Swagger - tst: 1716638268 + tst: 1716638918 servers: - url: http://{defaultHost} variables: