Move AccountApplicationsPolicy -> Account::ApplicationPolicy

TODO: Fold this into the relevant commits in this branch
alphagov · Sep 21, 2023 · dbcaa9a · dbcaa9a
1 parent 267beca
commit dbcaa9a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/app/controllers/account/applications_controller.rb b/app/controllers/account/applications_controller.rb
@@ -4,13 +4,13 @@ class Account::ApplicationsController < ApplicationController
   before_action :authenticate_user!
 
   def show
-    authorize :account_applications
+    authorize [:account, Doorkeeper::Application]
 
     redirect_to account_applications_path
   end
 
   def index
-    authorize :account_applications
+    authorize [:account, Doorkeeper::Application]
 
     @applications_with_signin = Doorkeeper::Application.can_signin(current_user)
     @applications_without_signin = Doorkeeper::Application.not_retired.without_signin_permission_for(current_user)

diff --git a/app/controllers/account/permissions_controller.rb b/app/controllers/account/permissions_controller.rb
@@ -6,6 +6,6 @@ class Account::PermissionsController < ApplicationController
   def index
     @application = Doorkeeper::Application.not_retired.find(params[:application_id])
 
-    authorize @application, :view_permissions?, policy_class: AccountApplicationsPolicy
+    authorize [:account, @application], :view_permissions?
   end
 end
diff --git a/app/controllers/account/signin_permissions_controller.rb b/app/controllers/account/signin_permissions_controller.rb
@@ -4,23 +4,24 @@ class Account::SigninPermissionsController < ApplicationController
   before_action :authenticate_user!
 
   def create
-    authorize :account_applications, :grant_signin_permission?
-
     application = Doorkeeper::Application.not_retired.find(params[:application_id])
+
+    authorize [:account, application], :grant_signin_permission?
+
     current_user.grant_application_signin_permission(application)
     redirect_to account_applications_path
   end
 
   def delete
     @application = Doorkeeper::Application.not_retired.find(params[:application_id])
 
-    authorize @application, :remove_signin_permission?, policy_class: AccountApplicationsPolicy
+    authorize [:account, @application], :remove_signin_permission?
   end
 
   def destroy
     application = Doorkeeper::Application.not_retired.find(params[:application_id])
 
-    authorize application, :remove_signin_permission?, policy_class: AccountApplicationsPolicy
+    authorize [:account, application], :remove_signin_permission?
 
     current_user.remove_application_signin_permission(application)
     redirect_to account_applications_path

diff --git a/app/policies/account_applications_policy.rb → app/policies/account/application_policy.rb b/app/policies/account_applications_policy.rb → app/policies/account/application_policy.rb
@@ -1,4 +1,4 @@
-class AccountApplicationsPolicy < BasePolicy
+class Account::ApplicationPolicy < BasePolicy
   def index?
     current_user.govuk_admin?
   end

diff --git a/...icies/account_applications_policy_test.rb → ...licies/account/application_policy_test.rb b/...icies/account_applications_policy_test.rb → ...licies/account/application_policy_test.rb
@@ -1,7 +1,7 @@
 require "test_helper"
 require "support/policy_helpers"
 
-class AccountApplicationsPolicyTest < ActiveSupport::TestCase
+class Account::ApplicationPolicyTest < ActiveSupport::TestCase
   include PolicyHelpers
 
   context "accessing index?" do