Move APIController to API::ApplicationController

DFE-Digital · Jan 9, 2025 · 2699911 · 2699911
1 parent 302ee03
commit 2699911
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 22 deletions.
diff --git a/app/controllers/api/accredited_provider_suggestions_controller.rb b/app/controllers/api/accredited_provider_suggestions_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module API
-  class AccreditedProviderSuggestionsController < PublicAPIController
+  class AccreditedProviderSuggestionsController < ApplicationController
     def index
       return render_json_error(status: 400, message: I18n.t('accredited_provider_suggestion.errors.bad_request')) if invalid_query?
 

diff --git a/app/controllers/api/application_controller.rb b/app/controllers/api/application_controller.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module API
+  class Controller < ActionController::API
+    include DfE::Analytics::Requests
+    include ActionController::HttpAuthentication::Token::ControllerMethods
+    include Pundit::Authorization
+
+    # child must define authenticate method
+    before_action :authenticate
+    after_action :verify_authorized
+  end
+end
diff --git a/app/controllers/api/public/v1/application_controller.rb b/app/controllers/api/public/v1/application_controller.rb
@@ -3,7 +3,7 @@
 module API
   module Public
     module V1
-      class ApplicationController < PublicAPIController
+      class ApplicationController < ApplicationController
         include PagyPagination
 
         private

diff --git a/app/controllers/api/public/v1/courses_controller.rb b/app/controllers/api/public/v1/courses_controller.rb
@@ -3,7 +3,7 @@
 module API
   module Public
     module V1
-      class CoursesController < API::Public::V1::ApplicationController
+      class CoursesController < ApplicationController
         def index
           render jsonapi: paginate(courses),
                  include: include_param,

diff --git a/app/controllers/api/public/v1/provider_suggestions_controller.rb b/app/controllers/api/public/v1/provider_suggestions_controller.rb
@@ -3,7 +3,7 @@
 module API
   module Public
     module V1
-      class ProviderSuggestionsController < API::Public::V1::ApplicationController
+      class ProviderSuggestionsController < ApplicationController
         def index
           return render_json_error(status: 400, message: I18n.t('provider_suggestion.errors.bad_request')) if invalid_query?
 

diff --git a/app/controllers/api/public/v1/providers/courses/locations_controller.rb b/app/controllers/api/public/v1/providers/courses/locations_controller.rb
@@ -5,7 +5,7 @@ module Public
     module V1
       module Providers
         module Courses
-          class LocationsController < API::Public::V1::ApplicationController
+          class LocationsController < ApplicationController
             def index
               render jsonapi: locations,
                      include: include_param,

diff --git a/app/controllers/api/public/v1/providers/courses_controller.rb b/app/controllers/api/public/v1/providers/courses_controller.rb
@@ -4,7 +4,7 @@ module API
   module Public
     module V1
       module Providers
-        class CoursesController < API::Public::V1::ApplicationController
+        class CoursesController < ApplicationController
           def index
             render jsonapi: paginate(courses),
                    include: include_param,

diff --git a/app/controllers/api/public/v1/providers/locations_controller.rb b/app/controllers/api/public/v1/providers/locations_controller.rb
@@ -4,7 +4,7 @@ module API
   module Public
     module V1
       module Providers
-        class LocationsController < API::Public::V1::ApplicationController
+        class LocationsController < ApplicationController
           def index
             render jsonapi: locations,
                    include: include_param,

diff --git a/app/controllers/api/public/v1/providers_controller.rb b/app/controllers/api/public/v1/providers_controller.rb
@@ -3,7 +3,7 @@
 module API
   module Public
     module V1
-      class ProvidersController < API::Public::V1::ApplicationController
+      class ProvidersController < ApplicationController
         def index
           render jsonapi: paginate(providers),
                  include: params[:include],

diff --git a/app/controllers/api/public/v1/subject_areas_controller.rb b/app/controllers/api/public/v1/subject_areas_controller.rb
@@ -3,7 +3,7 @@
 module API
   module Public
     module V1
-      class SubjectAreasController < API::Public::V1::ApplicationController
+      class SubjectAreasController < ApplicationController
         def index
           render(
             jsonapi: SubjectArea.active.includes(subjects: [:financial_incentive]),

diff --git a/app/controllers/api/public/v1/subjects_controller.rb b/app/controllers/api/public/v1/subjects_controller.rb
@@ -3,7 +3,7 @@
 module API
   module Public
     module V1
-      class SubjectsController < API::Public::V1::ApplicationController
+      class SubjectsController < ApplicationController
         def index
           subjects = Subject.active.includes(:financial_incentive)
 

diff --git a/app/controllers/api/school_suggestions_controller.rb b/app/controllers/api/school_suggestions_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module API
-  class SchoolSuggestionsController < PublicAPIController
+  class SchoolSuggestionsController < ApplicationController
     def index
       return render_json_error(status: 400, message: I18n.t('school_suggestion.errors.bad_request')) if invalid_query?
 

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb