[CPDLP-3843] Address PR comments

DFE-Digital · Dec 20, 2024 · f761ecc · f761ecc
1 parent c5d6e06
commit f761ecc
Show file tree

Hide file tree

Showing 15 changed files with 39 additions and 14 deletions.
diff --git a/app/controllers/api/v1/ecf_participants_controller.rb b/app/controllers/api/v1/ecf_participants_controller.rb
@@ -5,7 +5,7 @@
 module Api
   module V1
     class ECFParticipantsController < Api::ApiController
-      include ApiTokenAuthenticatable
+      include LeadProviderApiTokenAuthenticatable
       include ApiPagination
       include ApiCsv
       include ApiFilter

diff --git a/app/controllers/api/v1/participant_declarations_controller.rb b/app/controllers/api/v1/participant_declarations_controller.rb
@@ -4,7 +4,7 @@ module Api
   module V1
     class ParticipantDeclarationsController < Api::ApiController
       include ApiAuditable
-      include ApiTokenAuthenticatable
+      include LeadProviderApiTokenAuthenticatable
       include ApiPagination
       include ApiCsv
       include ApiFilter

diff --git a/app/controllers/api/v1/participants_controller.rb b/app/controllers/api/v1/participants_controller.rb
@@ -5,7 +5,7 @@
 module Api
   module V1
     class ParticipantsController < Api::ApiController
-      include ApiTokenAuthenticatable
+      include LeadProviderApiTokenAuthenticatable
       include ParticipantActions
     end
   end

diff --git a/app/controllers/api/v3/delivery_partners_controller.rb b/app/controllers/api/v3/delivery_partners_controller.rb
@@ -3,7 +3,7 @@
 module Api
   module V3
     class DeliveryPartnersController < Api::ApiController
-      include ApiTokenAuthenticatable
+      include LeadProviderApiTokenAuthenticatable
       include ApiPagination
       include ApiFilterValidation
 

diff --git a/app/controllers/api/v3/ecf/partnerships_controller.rb b/app/controllers/api/v3/ecf/partnerships_controller.rb
@@ -4,7 +4,7 @@ module Api
   module V3
     module ECF
       class PartnershipsController < Api::ApiController
-        include ApiTokenAuthenticatable
+        include LeadProviderApiTokenAuthenticatable
         include ApiPagination
         include ApiFilterValidation
 

diff --git a/app/controllers/api/v3/ecf/schools_controller.rb b/app/controllers/api/v3/ecf/schools_controller.rb
@@ -4,7 +4,7 @@ module Api
   module V3
     module ECF
       class SchoolsController < Api::ApiController
-        include ApiTokenAuthenticatable
+        include LeadProviderApiTokenAuthenticatable
         include ApiPagination
         include ApiFilterValidation
 

diff --git a/app/controllers/api/v3/ecf/transfers_controller.rb b/app/controllers/api/v3/ecf/transfers_controller.rb
@@ -4,7 +4,7 @@ module Api
   module V3
     module ECF
       class TransfersController < Api::ApiController
-        include ApiTokenAuthenticatable
+        include LeadProviderApiTokenAuthenticatable
         include ApiPagination
         include ApiFilterValidation
 

diff --git a/app/controllers/api/v3/ecf/unfunded_mentors_controller.rb b/app/controllers/api/v3/ecf/unfunded_mentors_controller.rb
@@ -4,7 +4,7 @@ module Api
   module V3
     module ECF
       class UnfundedMentorsController < Api::ApiController
-        include ApiTokenAuthenticatable
+        include LeadProviderApiTokenAuthenticatable
         include ApiPagination
         include ApiFilterValidation
 

diff --git a/app/controllers/api/v3/finance/statements_controller.rb b/app/controllers/api/v3/finance/statements_controller.rb
@@ -3,7 +3,7 @@
 module Api
   module V3
     class Finance::StatementsController < Api::ApiController
-      include ApiTokenAuthenticatable
+      include LeadProviderApiTokenAuthenticatable
       include ApiPagination
       include ApiFilterValidation
 

diff --git a/app/controllers/api/v3/participant_declarations_controller.rb b/app/controllers/api/v3/participant_declarations_controller.rb
@@ -4,7 +4,7 @@ module Api
   module V3
     class ParticipantDeclarationsController < Api::ApiController
       include ApiAuditable
-      include ApiTokenAuthenticatable
+      include LeadProviderApiTokenAuthenticatable
       include ApiPagination
       include ApiFilterValidation
 

diff --git a/app/controllers/concerns/api_token_authenticatable.rb b/app/controllers/concerns/api_token_authenticatable.rb
@@ -50,6 +50,6 @@ def check_access_scope
   end
 
   def access_scope
-    LeadProviderApiToken.joins(cpd_lead_provider: [:lead_provider])
+    ApiToken.all
   end
 end
diff --git a/app/controllers/concerns/lead_provider_api_token_authenticatable.rb b/app/controllers/concerns/lead_provider_api_token_authenticatable.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module LeadProviderApiTokenAuthenticatable
+  extend ActiveSupport::Concern
+  include ApiTokenAuthenticatable
+
+private
+
+  def access_scope
+    LeadProviderApiToken.joins(cpd_lead_provider: [:lead_provider])
+  end
+end
diff --git a/app/models/npq_registration_api_token.rb b/app/models/npq_registration_api_token.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class NPQRegistrationApiToken < ApiToken
+  attribute :private_api_access, default: true
+
+  def owner
+    "npq_registration_application"
+  end
+
+  def owner_description
+    "NPQ registration application"
+  end
+end
diff --git a/spec/controllers/api/api_controller_spec.rb b/spec/controllers/api/api_controller_spec.rb
@@ -24,8 +24,8 @@ def index; end
     end
 
     context "when authorization header is provided" do
-      let(:cpd_lead_provider) { create(:cpd_lead_provider, :with_lead_provider) }
-      let(:token) { LeadProviderApiToken.create_with_random_token!(cpd_lead_provider:) }
+      let(:lead_provider) { create(:lead_provider) }
+      let(:token) { LeadProviderApiToken.create_with_random_token!(lead_provider:) }
       let(:bearer_token) { "Bearer #{token}" }
 
       it "requests authentication via the http header" do

diff --git a/spec/docs/v3/statements_spec.rb b/spec/docs/v3/statements_spec.rb
@@ -3,7 +3,7 @@
 require "swagger_helper"
 
 RSpec.describe "API", type: :request, swagger_doc: "v3/api_spec.json" do
-  let(:cpd_lead_provider) { create(:cpd_lead_provider) }
+  let(:cpd_lead_provider) { create(:cpd_lead_provider, :with_lead_provider) }
   let(:token) { LeadProviderApiToken.create_with_random_token!(cpd_lead_provider:) }
   let(:bearer_token) { "Bearer #{token}" }
   let(:Authorization) { bearer_token }