diff --git a/lib/NGCP/Panel/Controller/API/Admins.pm b/lib/NGCP/Panel/Controller/API/Admins.pm index e8c2bd1f89..1ecf97adc6 100644 --- a/lib/NGCP/Panel/Controller/API/Admins.pm +++ b/lib/NGCP/Panel/Controller/API/Admins.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub api_description { @@ -73,7 +73,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/ApplyRewrites.pm b/lib/NGCP/Panel/Controller/API/ApplyRewrites.pm index dac0ac343d..f33338697e 100644 --- a/lib/NGCP/Panel/Controller/API/ApplyRewrites.pm +++ b/lib/NGCP/Panel/Controller/API/ApplyRewrites.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -52,7 +52,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/AutoAttendants.pm b/lib/NGCP/Panel/Controller/API/AutoAttendants.pm index 6b5b3f574f..ac8bc55dcf 100644 --- a/lib/NGCP/Panel/Controller/API/AutoAttendants.pm +++ b/lib/NGCP/Panel/Controller/API/AutoAttendants.pm @@ -16,7 +16,7 @@ use Safe::Isa qw($_isa); use UUID; require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -55,7 +55,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/AutoAttendantsItem.pm b/lib/NGCP/Panel/Controller/API/AutoAttendantsItem.pm index 105aaef981..b1bd0adc88 100644 --- a/lib/NGCP/Panel/Controller/API/AutoAttendantsItem.pm +++ b/lib/NGCP/Panel/Controller/API/AutoAttendantsItem.pm @@ -13,7 +13,7 @@ use NGCP::Panel::Utils::DateTime; use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -53,7 +53,7 @@ __PACKAGE__->config( Does => [qw(ACL RequireSSL)], }) } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/BalanceIntervals.pm b/lib/NGCP/Panel/Controller/API/BalanceIntervals.pm index ab3fbdae9b..96bde2c06a 100644 --- a/lib/NGCP/Panel/Controller/API/BalanceIntervals.pm +++ b/lib/NGCP/Panel/Controller/API/BalanceIntervals.pm @@ -14,7 +14,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -98,7 +98,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/BalanceIntervalsItem.pm b/lib/NGCP/Panel/Controller/API/BalanceIntervalsItem.pm index 1c78483b66..66e152cfc0 100644 --- a/lib/NGCP/Panel/Controller/API/BalanceIntervalsItem.pm +++ b/lib/NGCP/Panel/Controller/API/BalanceIntervalsItem.pm @@ -11,7 +11,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -96,7 +96,7 @@ __PACKAGE__->config( Does => [qw(ACL RequireSSL)] }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/BillingFees.pm b/lib/NGCP/Panel/Controller/API/BillingFees.pm index e37268fb1e..b534152da3 100644 --- a/lib/NGCP/Panel/Controller/API/BillingFees.pm +++ b/lib/NGCP/Panel/Controller/API/BillingFees.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use NGCP::Panel::Utils::Billing; require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -63,7 +63,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/BillingFeesItem.pm b/lib/NGCP/Panel/Controller/API/BillingFeesItem.pm index 6115bf70af..e3605c909b 100644 --- a/lib/NGCP/Panel/Controller/API/BillingFeesItem.pm +++ b/lib/NGCP/Panel/Controller/API/BillingFeesItem.pm @@ -10,7 +10,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -40,7 +40,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/BillingNetworks.pm b/lib/NGCP/Panel/Controller/API/BillingNetworks.pm index 5550344f03..f3d0074a7a 100644 --- a/lib/NGCP/Panel/Controller/API/BillingNetworks.pm +++ b/lib/NGCP/Panel/Controller/API/BillingNetworks.pm @@ -14,7 +14,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -88,7 +88,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/BillingNetworksItem.pm b/lib/NGCP/Panel/Controller/API/BillingNetworksItem.pm index f120721caa..c92a82de4a 100644 --- a/lib/NGCP/Panel/Controller/API/BillingNetworksItem.pm +++ b/lib/NGCP/Panel/Controller/API/BillingNetworksItem.pm @@ -13,7 +13,7 @@ use NGCP::Panel::Utils::Reseller qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -53,7 +53,7 @@ __PACKAGE__->config( Does => [qw(ACL RequireSSL)], }) } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/BillingProfiles.pm b/lib/NGCP/Panel/Controller/API/BillingProfiles.pm index 53e07112f2..1100eae484 100644 --- a/lib/NGCP/Panel/Controller/API/BillingProfiles.pm +++ b/lib/NGCP/Panel/Controller/API/BillingProfiles.pm @@ -14,7 +14,7 @@ use NGCP::Panel::Utils::Billing qw(); use Path::Tiny qw(path); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -75,7 +75,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/BillingProfilesItem.pm b/lib/NGCP/Panel/Controller/API/BillingProfilesItem.pm index 11c5ad8692..9b3e94fc1f 100644 --- a/lib/NGCP/Panel/Controller/API/BillingProfilesItem.pm +++ b/lib/NGCP/Panel/Controller/API/BillingProfilesItem.pm @@ -10,7 +10,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -50,7 +50,7 @@ __PACKAGE__->config( Does => [qw(ACL RequireSSL)], }) } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/BillingZones.pm b/lib/NGCP/Panel/Controller/API/BillingZones.pm index 73aa4e286c..afacf33cdc 100644 --- a/lib/NGCP/Panel/Controller/API/BillingZones.pm +++ b/lib/NGCP/Panel/Controller/API/BillingZones.pm @@ -12,7 +12,7 @@ use NGCP::Panel::Utils::DateTime; use Path::Tiny qw(path); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -73,7 +73,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/BillingZonesItem.pm b/lib/NGCP/Panel/Controller/API/BillingZonesItem.pm index e38eea8ebd..b4c4e2044f 100644 --- a/lib/NGCP/Panel/Controller/API/BillingZonesItem.pm +++ b/lib/NGCP/Panel/Controller/API/BillingZonesItem.pm @@ -10,7 +10,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -50,7 +50,7 @@ __PACKAGE__->config( Does => [qw(ACL RequireSSL)], }) } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/CCMapEntries.pm b/lib/NGCP/Panel/Controller/API/CCMapEntries.pm index 3f4ca48206..c53c27ab59 100644 --- a/lib/NGCP/Panel/Controller/API/CCMapEntries.pm +++ b/lib/NGCP/Panel/Controller/API/CCMapEntries.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -53,7 +53,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/CCMapEntriesItem.pm b/lib/NGCP/Panel/Controller/API/CCMapEntriesItem.pm index e0b2d009ae..457fd555df 100644 --- a/lib/NGCP/Panel/Controller/API/CCMapEntriesItem.pm +++ b/lib/NGCP/Panel/Controller/API/CCMapEntriesItem.pm @@ -13,7 +13,7 @@ use NGCP::Panel::Utils::DateTime; use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -53,7 +53,7 @@ __PACKAGE__->config( Does => [qw(ACL RequireSSL)], }) } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/CFDestinationSets.pm b/lib/NGCP/Panel/Controller/API/CFDestinationSets.pm index af5b04c535..b46e31b73f 100644 --- a/lib/NGCP/Panel/Controller/API/CFDestinationSets.pm +++ b/lib/NGCP/Panel/Controller/API/CFDestinationSets.pm @@ -11,7 +11,7 @@ use TryCatch; use NGCP::Panel::Utils::DateTime; require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -76,7 +76,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/CFDestinationSetsItem.pm b/lib/NGCP/Panel/Controller/API/CFDestinationSetsItem.pm index ab027a24e7..89f7a14754 100644 --- a/lib/NGCP/Panel/Controller/API/CFDestinationSetsItem.pm +++ b/lib/NGCP/Panel/Controller/API/CFDestinationSetsItem.pm @@ -13,7 +13,7 @@ use NGCP::Panel::Utils::DateTime; use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -53,7 +53,7 @@ __PACKAGE__->config( Does => [qw(ACL RequireSSL)], }) } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/CFMappings.pm b/lib/NGCP/Panel/Controller/API/CFMappings.pm index 382ba5302c..298279fe83 100644 --- a/lib/NGCP/Panel/Controller/API/CFMappings.pm +++ b/lib/NGCP/Panel/Controller/API/CFMappings.pm @@ -11,7 +11,7 @@ use TryCatch; use NGCP::Panel::Utils::DateTime; require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -65,7 +65,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/CFMappingsItem.pm b/lib/NGCP/Panel/Controller/API/CFMappingsItem.pm index 73ab654dcc..7a6cf281bc 100644 --- a/lib/NGCP/Panel/Controller/API/CFMappingsItem.pm +++ b/lib/NGCP/Panel/Controller/API/CFMappingsItem.pm @@ -13,7 +13,7 @@ use NGCP::Panel::Utils::DateTime; use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -53,7 +53,7 @@ __PACKAGE__->config( Does => [qw(ACL RequireSSL)], }) } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/CFTimeSets.pm b/lib/NGCP/Panel/Controller/API/CFTimeSets.pm index b7b5e0a20f..9328b4596c 100644 --- a/lib/NGCP/Panel/Controller/API/CFTimeSets.pm +++ b/lib/NGCP/Panel/Controller/API/CFTimeSets.pm @@ -11,7 +11,7 @@ use TryCatch; use NGCP::Panel::Utils::DateTime; require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -76,7 +76,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/CFTimeSetsItem.pm b/lib/NGCP/Panel/Controller/API/CFTimeSetsItem.pm index 62ee22ae43..77d3809881 100644 --- a/lib/NGCP/Panel/Controller/API/CFTimeSetsItem.pm +++ b/lib/NGCP/Panel/Controller/API/CFTimeSetsItem.pm @@ -13,7 +13,7 @@ use NGCP::Panel::Utils::DateTime; use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -53,7 +53,7 @@ __PACKAGE__->config( Does => [qw(ACL RequireSSL)], }) } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/CallControls.pm b/lib/NGCP/Panel/Controller/API/CallControls.pm index 95ecdc5338..07df33833b 100644 --- a/lib/NGCP/Panel/Controller/API/CallControls.pm +++ b/lib/NGCP/Panel/Controller/API/CallControls.pm @@ -16,7 +16,7 @@ use NGCP::Panel::Utils::Sems; require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -55,7 +55,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/CallForwards.pm b/lib/NGCP/Panel/Controller/API/CallForwards.pm index fb8c4619ef..a32423553b 100644 --- a/lib/NGCP/Panel/Controller/API/CallForwards.pm +++ b/lib/NGCP/Panel/Controller/API/CallForwards.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -68,7 +68,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/CallForwardsItem.pm b/lib/NGCP/Panel/Controller/API/CallForwardsItem.pm index c748e9822d..a804edf569 100644 --- a/lib/NGCP/Panel/Controller/API/CallForwardsItem.pm +++ b/lib/NGCP/Panel/Controller/API/CallForwardsItem.pm @@ -13,7 +13,7 @@ use NGCP::Panel::Utils::DateTime; use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -53,7 +53,7 @@ __PACKAGE__->config( Does => [qw(ACL RequireSSL)], }) } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/CallLists.pm b/lib/NGCP/Panel/Controller/API/CallLists.pm index 6af0aaefe5..64f11b89d1 100644 --- a/lib/NGCP/Panel/Controller/API/CallLists.pm +++ b/lib/NGCP/Panel/Controller/API/CallLists.pm @@ -14,7 +14,7 @@ use Safe::Isa qw($_isa); use DateTime::TimeZone; require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -230,7 +230,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/CallListsItem.pm b/lib/NGCP/Panel/Controller/API/CallListsItem.pm index 6501fb7ae9..aeafd083e7 100644 --- a/lib/NGCP/Panel/Controller/API/CallListsItem.pm +++ b/lib/NGCP/Panel/Controller/API/CallListsItem.pm @@ -11,7 +11,7 @@ use DateTime::TimeZone; use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -41,7 +41,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/Calls.pm b/lib/NGCP/Panel/Controller/API/Calls.pm index 8327209464..a19eef0f0b 100644 --- a/lib/NGCP/Panel/Controller/API/Calls.pm +++ b/lib/NGCP/Panel/Controller/API/Calls.pm @@ -14,7 +14,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -87,7 +87,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/CallsItem.pm b/lib/NGCP/Panel/Controller/API/CallsItem.pm index bf90ab6687..3640ed5514 100644 --- a/lib/NGCP/Panel/Controller/API/CallsItem.pm +++ b/lib/NGCP/Panel/Controller/API/CallsItem.pm @@ -10,7 +10,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -40,7 +40,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/Contracts.pm b/lib/NGCP/Panel/Controller/API/Contracts.pm index 0ecd3e6902..9e75b495e4 100644 --- a/lib/NGCP/Panel/Controller/API/Contracts.pm +++ b/lib/NGCP/Panel/Controller/API/Contracts.pm @@ -14,7 +14,7 @@ use NGCP::Panel::Utils::ProfilePackages qw(); use Path::Tiny qw(path); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -86,7 +86,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/ContractsItem.pm b/lib/NGCP/Panel/Controller/API/ContractsItem.pm index 60b69d2ee9..2e66e23bfb 100644 --- a/lib/NGCP/Panel/Controller/API/ContractsItem.pm +++ b/lib/NGCP/Panel/Controller/API/ContractsItem.pm @@ -14,7 +14,7 @@ use NGCP::Panel::Utils::Contract qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -54,7 +54,7 @@ __PACKAGE__->config( Does => [qw(ACL RequireSSL)], }) } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/CustomerBalances.pm b/lib/NGCP/Panel/Controller/API/CustomerBalances.pm index fa7cd2d30b..e442293886 100644 --- a/lib/NGCP/Panel/Controller/API/CustomerBalances.pm +++ b/lib/NGCP/Panel/Controller/API/CustomerBalances.pm @@ -14,7 +14,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -114,7 +114,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/CustomerBalancesItem.pm b/lib/NGCP/Panel/Controller/API/CustomerBalancesItem.pm index cd018c7502..6527fb8c52 100644 --- a/lib/NGCP/Panel/Controller/API/CustomerBalancesItem.pm +++ b/lib/NGCP/Panel/Controller/API/CustomerBalancesItem.pm @@ -10,7 +10,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -50,7 +50,7 @@ __PACKAGE__->config( Does => [qw(ACL RequireSSL)], }) } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/CustomerContacts.pm b/lib/NGCP/Panel/Controller/API/CustomerContacts.pm index 3a82dc31d3..67b186f1b4 100644 --- a/lib/NGCP/Panel/Controller/API/CustomerContacts.pm +++ b/lib/NGCP/Panel/Controller/API/CustomerContacts.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -74,7 +74,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/CustomerContactsItem.pm b/lib/NGCP/Panel/Controller/API/CustomerContactsItem.pm index e007e7902d..c2da3cfdbd 100644 --- a/lib/NGCP/Panel/Controller/API/CustomerContactsItem.pm +++ b/lib/NGCP/Panel/Controller/API/CustomerContactsItem.pm @@ -10,7 +10,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -50,7 +50,7 @@ __PACKAGE__->config( Does => [qw(ACL RequireSSL)], }) } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { @@ -111,7 +111,7 @@ sub PATCH :Allow { last unless $preference; my $json = $self->get_valid_patch_data( - c => $c, + c => $c, id => $id, media_type => 'application/json-patch+json', ); @@ -126,7 +126,7 @@ sub PATCH :Allow { my $form = $self->get_form($c); $contact = $self->update_contact($c, $contact, $old_resource, $resource, $form); last unless $contact; - + my $hal = $self->hal_from_contact($c, $contact, $form); last unless $self->add_update_journal_item_hal($c,$hal); @@ -172,7 +172,7 @@ sub PUT :Allow { my $hal = $self->hal_from_contact($c, $contact, $form); last unless $self->add_update_journal_item_hal($c,$hal); - + $guard->commit; if ('minimal' eq $preference) { @@ -206,13 +206,13 @@ sub DELETE :Allow { $self->error($c, HTTP_LOCKED, "Contact is still in use."); last; } else { - + last unless $self->add_delete_journal_item_hal($c,sub { my $self = shift; my ($c) = @_; my $_form = $self->get_form($c); return $self->hal_from_contact($c, $contact, $_form); }); - + $contact->delete; } $guard->commit; diff --git a/lib/NGCP/Panel/Controller/API/CustomerFraudEvents.pm b/lib/NGCP/Panel/Controller/API/CustomerFraudEvents.pm index 5f614ab168..c93ace7416 100644 --- a/lib/NGCP/Panel/Controller/API/CustomerFraudEvents.pm +++ b/lib/NGCP/Panel/Controller/API/CustomerFraudEvents.pm @@ -10,7 +10,7 @@ use MooseX::ClassAttribute qw(class_has); use Path::Tiny qw(path); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -65,7 +65,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/CustomerFraudEventsItem.pm b/lib/NGCP/Panel/Controller/API/CustomerFraudEventsItem.pm index e95f90488f..06c769b21b 100644 --- a/lib/NGCP/Panel/Controller/API/CustomerFraudEventsItem.pm +++ b/lib/NGCP/Panel/Controller/API/CustomerFraudEventsItem.pm @@ -7,7 +7,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -46,7 +46,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }), }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/CustomerLocations.pm b/lib/NGCP/Panel/Controller/API/CustomerLocations.pm index c9e8187030..c149f9967a 100644 --- a/lib/NGCP/Panel/Controller/API/CustomerLocations.pm +++ b/lib/NGCP/Panel/Controller/API/CustomerLocations.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -76,7 +76,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/CustomerLocationsItem.pm b/lib/NGCP/Panel/Controller/API/CustomerLocationsItem.pm index 617f9ae059..56bc53e676 100644 --- a/lib/NGCP/Panel/Controller/API/CustomerLocationsItem.pm +++ b/lib/NGCP/Panel/Controller/API/CustomerLocationsItem.pm @@ -13,7 +13,7 @@ use NGCP::Panel::Utils::Reseller qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -53,7 +53,7 @@ __PACKAGE__->config( Does => [qw(ACL RequireSSL)], }) } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/CustomerPreferenceDefs.pm b/lib/NGCP/Panel/Controller/API/CustomerPreferenceDefs.pm index 62aa504149..f00643a1d9 100644 --- a/lib/NGCP/Panel/Controller/API/CustomerPreferenceDefs.pm +++ b/lib/NGCP/Panel/Controller/API/CustomerPreferenceDefs.pm @@ -15,7 +15,7 @@ use Safe::Isa qw($_isa); use JSON::Types qw(); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -45,7 +45,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/CustomerPreferences.pm b/lib/NGCP/Panel/Controller/API/CustomerPreferences.pm index 8c9ba6ee30..e45fff0d39 100644 --- a/lib/NGCP/Panel/Controller/API/CustomerPreferences.pm +++ b/lib/NGCP/Panel/Controller/API/CustomerPreferences.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -56,7 +56,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/CustomerPreferencesItem.pm b/lib/NGCP/Panel/Controller/API/CustomerPreferencesItem.pm index d9eadf8d4d..c13c6bc558 100644 --- a/lib/NGCP/Panel/Controller/API/CustomerPreferencesItem.pm +++ b/lib/NGCP/Panel/Controller/API/CustomerPreferencesItem.pm @@ -13,7 +13,7 @@ use NGCP::Panel::Utils::DateTime; use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -53,7 +53,7 @@ __PACKAGE__->config( Does => [qw(ACL RequireSSL)], }) } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/CustomerZoneCosts.pm b/lib/NGCP/Panel/Controller/API/CustomerZoneCosts.pm index 442b85cf30..09126f0b3b 100644 --- a/lib/NGCP/Panel/Controller/API/CustomerZoneCosts.pm +++ b/lib/NGCP/Panel/Controller/API/CustomerZoneCosts.pm @@ -11,7 +11,7 @@ use TryCatch; use NGCP::Panel::Utils::DateTime; require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -72,7 +72,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/CustomerZoneCostsItem.pm b/lib/NGCP/Panel/Controller/API/CustomerZoneCostsItem.pm index 42ac757352..a882d4462c 100644 --- a/lib/NGCP/Panel/Controller/API/CustomerZoneCostsItem.pm +++ b/lib/NGCP/Panel/Controller/API/CustomerZoneCostsItem.pm @@ -13,7 +13,7 @@ use NGCP::Panel::Utils::DateTime; use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -43,7 +43,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/Customers.pm b/lib/NGCP/Panel/Controller/API/Customers.pm index fc7e331cb8..d6809ab78a 100644 --- a/lib/NGCP/Panel/Controller/API/Customers.pm +++ b/lib/NGCP/Panel/Controller/API/Customers.pm @@ -14,7 +14,7 @@ use NGCP::Panel::Utils::ProfilePackages qw(); use Path::Tiny qw(path); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -132,7 +132,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/CustomersItem.pm b/lib/NGCP/Panel/Controller/API/CustomersItem.pm index 8f1d34aa86..83764021e5 100644 --- a/lib/NGCP/Panel/Controller/API/CustomersItem.pm +++ b/lib/NGCP/Panel/Controller/API/CustomersItem.pm @@ -14,7 +14,7 @@ use NGCP::Panel::Utils::Contract qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -54,7 +54,7 @@ __PACKAGE__->config( Does => [qw(ACL RequireSSL)], }) } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { @@ -62,7 +62,7 @@ sub auto :Private { $self->set_body($c); $self->log_request($c); - #$self->apply_fake_time($c); + #$self->apply_fake_time($c); } sub GET :Allow { @@ -119,7 +119,7 @@ sub PATCH :Allow { last unless $preference; my $json = $self->get_valid_patch_data( - c => $c, + c => $c, id => $id, media_type => 'application/json-patch+json', ); @@ -133,7 +133,7 @@ sub PATCH :Allow { delete $old_resource->{profile_package_id}; my $billing_mapping = $customer->billing_mappings->find($customer->get_column('bmid')); $old_resource->{billing_profile_id} = $billing_mapping->billing_profile_id; - $old_resource->{billing_profile_definition} = undef; + $old_resource->{billing_profile_definition} = undef; my $resource = $self->apply_patch($c, $old_resource, $json, sub { my ($missing_field,$entity) = @_; @@ -142,7 +142,7 @@ sub PATCH :Allow { $entity->{billing_profile_definition} //= 'profiles'; } elsif ($missing_field eq 'profile_package_id') { $entity->{profile_package_id} = $customer->profile_package_id; - $entity->{billing_profile_definition} //= 'package'; + $entity->{billing_profile_definition} //= 'package'; } }); last unless $resource; @@ -150,7 +150,7 @@ sub PATCH :Allow { my $form = $self->get_form($c); $customer = $self->update_customer($c, $customer, $old_resource, $resource, $form, $now); last unless $customer; - + my $hal = $self->hal_from_customer($c, $customer, $form, $now); last unless $self->add_update_journal_item_hal($c,$hal); @@ -195,7 +195,7 @@ sub PUT :Allow { my $form = $self->get_form($c); $customer = $self->update_customer($c, $customer, $old_resource, $resource, $form, $now); last unless $customer; - + my $hal = $self->hal_from_customer($c, $customer, $form,$now); last unless $self->add_update_journal_item_hal($c,$hal); @@ -248,7 +248,7 @@ sub DELETE :Allow { sub get_journal_methods{ return [qw/handle_item_base_journal handle_journals_get handle_journalsitem_get handle_journals_options handle_journalsitem_options handle_journals_head handle_journalsitem_head/]; -} +} sub end : Private { my ($self, $c) = @_; diff --git a/lib/NGCP/Panel/Controller/API/DomainPreferenceDefs.pm b/lib/NGCP/Panel/Controller/API/DomainPreferenceDefs.pm index 08e5f6d108..0f43456453 100644 --- a/lib/NGCP/Panel/Controller/API/DomainPreferenceDefs.pm +++ b/lib/NGCP/Panel/Controller/API/DomainPreferenceDefs.pm @@ -15,7 +15,7 @@ use Safe::Isa qw($_isa); use JSON::Types qw(); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -45,7 +45,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/DomainPreferences.pm b/lib/NGCP/Panel/Controller/API/DomainPreferences.pm index 03dea98380..ffe02d6c4a 100644 --- a/lib/NGCP/Panel/Controller/API/DomainPreferences.pm +++ b/lib/NGCP/Panel/Controller/API/DomainPreferences.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -47,7 +47,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/DomainPreferencesItem.pm b/lib/NGCP/Panel/Controller/API/DomainPreferencesItem.pm index 47c733971b..99559665fa 100644 --- a/lib/NGCP/Panel/Controller/API/DomainPreferencesItem.pm +++ b/lib/NGCP/Panel/Controller/API/DomainPreferencesItem.pm @@ -13,7 +13,7 @@ use NGCP::Panel::Utils::DateTime; use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -43,7 +43,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/Domains.pm b/lib/NGCP/Panel/Controller/API/Domains.pm index 2c8f90197e..d995cb065b 100644 --- a/lib/NGCP/Panel/Controller/API/Domains.pm +++ b/lib/NGCP/Panel/Controller/API/Domains.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -76,7 +76,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/DomainsItem.pm b/lib/NGCP/Panel/Controller/API/DomainsItem.pm index aa96f449c2..a5d99acf05 100644 --- a/lib/NGCP/Panel/Controller/API/DomainsItem.pm +++ b/lib/NGCP/Panel/Controller/API/DomainsItem.pm @@ -13,7 +13,7 @@ use NGCP::Panel::Utils::DateTime; use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -53,7 +53,7 @@ __PACKAGE__->config( Does => [qw(ACL RequireSSL)], }) }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/EmailTemplates.pm b/lib/NGCP/Panel/Controller/API/EmailTemplates.pm index e6577f44e0..9f93ba0615 100644 --- a/lib/NGCP/Panel/Controller/API/EmailTemplates.pm +++ b/lib/NGCP/Panel/Controller/API/EmailTemplates.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -63,7 +63,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/EmailTemplatesItem.pm b/lib/NGCP/Panel/Controller/API/EmailTemplatesItem.pm index 76347cf1be..d2cc7f13cb 100644 --- a/lib/NGCP/Panel/Controller/API/EmailTemplatesItem.pm +++ b/lib/NGCP/Panel/Controller/API/EmailTemplatesItem.pm @@ -10,7 +10,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -40,7 +40,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/FaxRecordings.pm b/lib/NGCP/Panel/Controller/API/FaxRecordings.pm index 93edb5d9e2..087d3f31fe 100644 --- a/lib/NGCP/Panel/Controller/API/FaxRecordings.pm +++ b/lib/NGCP/Panel/Controller/API/FaxRecordings.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -47,7 +47,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/FaxRecordingsItem.pm b/lib/NGCP/Panel/Controller/API/FaxRecordingsItem.pm index 66013e88bb..912a0839f4 100644 --- a/lib/NGCP/Panel/Controller/API/FaxRecordingsItem.pm +++ b/lib/NGCP/Panel/Controller/API/FaxRecordingsItem.pm @@ -12,7 +12,7 @@ use Safe::Isa qw($_isa); use File::Type; use File::Slurp; require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -42,7 +42,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/Faxes.pm b/lib/NGCP/Panel/Controller/API/Faxes.pm index effea384ea..41c487d790 100644 --- a/lib/NGCP/Panel/Controller/API/Faxes.pm +++ b/lib/NGCP/Panel/Controller/API/Faxes.pm @@ -17,7 +17,7 @@ use NGCP::Panel::Utils::Fax; use Encode qw( encode_utf8 ); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -75,7 +75,7 @@ __PACKAGE__->config( ('POST' eq $_) ? (ContentType => ['multipart/form-data']) : (), } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/FaxesItem.pm b/lib/NGCP/Panel/Controller/API/FaxesItem.pm index d67f4e8246..d5c565588f 100644 --- a/lib/NGCP/Panel/Controller/API/FaxesItem.pm +++ b/lib/NGCP/Panel/Controller/API/FaxesItem.pm @@ -11,7 +11,7 @@ use NGCP::Panel::Utils::Subscriber; use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -41,7 +41,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/FaxserverSettings.pm b/lib/NGCP/Panel/Controller/API/FaxserverSettings.pm index f7c23ca1a1..a6334b81aa 100644 --- a/lib/NGCP/Panel/Controller/API/FaxserverSettings.pm +++ b/lib/NGCP/Panel/Controller/API/FaxserverSettings.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -85,7 +85,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/FaxserverSettingsItem.pm b/lib/NGCP/Panel/Controller/API/FaxserverSettingsItem.pm index 80000fdce4..720da55ace 100644 --- a/lib/NGCP/Panel/Controller/API/FaxserverSettingsItem.pm +++ b/lib/NGCP/Panel/Controller/API/FaxserverSettingsItem.pm @@ -14,7 +14,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); use Clone qw/clone/; require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -54,7 +54,7 @@ __PACKAGE__->config( Does => [qw(ACL RequireSSL)], }) } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/Interceptions.pm b/lib/NGCP/Panel/Controller/API/Interceptions.pm index 6b7e3423bc..300049f01d 100644 --- a/lib/NGCP/Panel/Controller/API/Interceptions.pm +++ b/lib/NGCP/Panel/Controller/API/Interceptions.pm @@ -15,7 +15,7 @@ use UUID qw/generate unparse/; use NGCP::Panel::Utils::DateTime; require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -76,7 +76,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/InterceptionsItem.pm b/lib/NGCP/Panel/Controller/API/InterceptionsItem.pm index 02b1b96653..3cebb99c79 100644 --- a/lib/NGCP/Panel/Controller/API/InterceptionsItem.pm +++ b/lib/NGCP/Panel/Controller/API/InterceptionsItem.pm @@ -10,7 +10,7 @@ use NGCP::Panel::Utils::Interception; use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -40,7 +40,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/InvoiceTemplates.pm b/lib/NGCP/Panel/Controller/API/InvoiceTemplates.pm index bf90f4b3ce..a7804eed88 100644 --- a/lib/NGCP/Panel/Controller/API/InvoiceTemplates.pm +++ b/lib/NGCP/Panel/Controller/API/InvoiceTemplates.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -63,7 +63,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/InvoiceTemplatesItem.pm b/lib/NGCP/Panel/Controller/API/InvoiceTemplatesItem.pm index 24d4bc6016..7f06cd9967 100644 --- a/lib/NGCP/Panel/Controller/API/InvoiceTemplatesItem.pm +++ b/lib/NGCP/Panel/Controller/API/InvoiceTemplatesItem.pm @@ -10,7 +10,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -40,7 +40,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/Invoices.pm b/lib/NGCP/Panel/Controller/API/Invoices.pm index f14f2d373a..8f0b52c292 100644 --- a/lib/NGCP/Panel/Controller/API/Invoices.pm +++ b/lib/NGCP/Panel/Controller/API/Invoices.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -109,7 +109,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/InvoicesItem.pm b/lib/NGCP/Panel/Controller/API/InvoicesItem.pm index 9380535874..1fae8ab8ee 100644 --- a/lib/NGCP/Panel/Controller/API/InvoicesItem.pm +++ b/lib/NGCP/Panel/Controller/API/InvoicesItem.pm @@ -10,7 +10,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -40,7 +40,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/LnpCarriers.pm b/lib/NGCP/Panel/Controller/API/LnpCarriers.pm index 966a1912cf..170b0eb5ec 100644 --- a/lib/NGCP/Panel/Controller/API/LnpCarriers.pm +++ b/lib/NGCP/Panel/Controller/API/LnpCarriers.pm @@ -13,7 +13,7 @@ use NGCP::Panel::Utils::Reseller qw(); use Path::Tiny qw(path); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -74,7 +74,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/LnpCarriersItem.pm b/lib/NGCP/Panel/Controller/API/LnpCarriersItem.pm index d78ff6490c..df0acd8505 100644 --- a/lib/NGCP/Panel/Controller/API/LnpCarriersItem.pm +++ b/lib/NGCP/Panel/Controller/API/LnpCarriersItem.pm @@ -10,7 +10,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -40,7 +40,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/LnpNumbers.pm b/lib/NGCP/Panel/Controller/API/LnpNumbers.pm index ef89a3f37c..1302a1cf3f 100644 --- a/lib/NGCP/Panel/Controller/API/LnpNumbers.pm +++ b/lib/NGCP/Panel/Controller/API/LnpNumbers.pm @@ -17,7 +17,7 @@ use NGCP::Panel::Utils::MySQL; require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -79,7 +79,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/LnpNumbersItem.pm b/lib/NGCP/Panel/Controller/API/LnpNumbersItem.pm index 8c5a9bd13b..4480f98b3f 100644 --- a/lib/NGCP/Panel/Controller/API/LnpNumbersItem.pm +++ b/lib/NGCP/Panel/Controller/API/LnpNumbersItem.pm @@ -10,7 +10,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -40,7 +40,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/MailToFaxSettings.pm b/lib/NGCP/Panel/Controller/API/MailToFaxSettings.pm index a4b0e1cff6..fa3188b1b5 100644 --- a/lib/NGCP/Panel/Controller/API/MailToFaxSettings.pm +++ b/lib/NGCP/Panel/Controller/API/MailToFaxSettings.pm @@ -12,7 +12,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ return [qw/GET OPTIONS HEAD/]; @@ -84,7 +84,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/MailToFaxSettingsItem.pm b/lib/NGCP/Panel/Controller/API/MailToFaxSettingsItem.pm index 03e303286a..502240e76a 100644 --- a/lib/NGCP/Panel/Controller/API/MailToFaxSettingsItem.pm +++ b/lib/NGCP/Panel/Controller/API/MailToFaxSettingsItem.pm @@ -14,7 +14,7 @@ use NGCP::Panel::Utils::DateTime; use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; use parent qw/Catalyst::Controller NGCP::Panel::Role::API::MailToFaxSettings/; @@ -53,7 +53,7 @@ __PACKAGE__->config( Does => [qw(ACL RequireSSL)], }) } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/MaliciousCalls.pm b/lib/NGCP/Panel/Controller/API/MaliciousCalls.pm index 6c4ea5e0d7..c78930614a 100644 --- a/lib/NGCP/Panel/Controller/API/MaliciousCalls.pm +++ b/lib/NGCP/Panel/Controller/API/MaliciousCalls.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -67,7 +67,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/MaliciousCallsItem.pm b/lib/NGCP/Panel/Controller/API/MaliciousCallsItem.pm index 776d7986fc..630cd907cf 100644 --- a/lib/NGCP/Panel/Controller/API/MaliciousCallsItem.pm +++ b/lib/NGCP/Panel/Controller/API/MaliciousCallsItem.pm @@ -10,7 +10,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -40,7 +40,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/NcosLevels.pm b/lib/NGCP/Panel/Controller/API/NcosLevels.pm index 5885091a4f..746198aa64 100644 --- a/lib/NGCP/Panel/Controller/API/NcosLevels.pm +++ b/lib/NGCP/Panel/Controller/API/NcosLevels.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -63,7 +63,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/NcosLevelsItem.pm b/lib/NGCP/Panel/Controller/API/NcosLevelsItem.pm index 985c9ef42f..b1c28f3ab9 100644 --- a/lib/NGCP/Panel/Controller/API/NcosLevelsItem.pm +++ b/lib/NGCP/Panel/Controller/API/NcosLevelsItem.pm @@ -10,7 +10,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -40,7 +40,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/NcosLnpCarriers.pm b/lib/NGCP/Panel/Controller/API/NcosLnpCarriers.pm index 03452eaaf4..2bc6c8bf80 100644 --- a/lib/NGCP/Panel/Controller/API/NcosLnpCarriers.pm +++ b/lib/NGCP/Panel/Controller/API/NcosLnpCarriers.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -74,7 +74,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/NcosLnpCarriersItem.pm b/lib/NGCP/Panel/Controller/API/NcosLnpCarriersItem.pm index 4057c7a6b4..11d372d2bd 100644 --- a/lib/NGCP/Panel/Controller/API/NcosLnpCarriersItem.pm +++ b/lib/NGCP/Panel/Controller/API/NcosLnpCarriersItem.pm @@ -10,7 +10,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -40,7 +40,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/NcosPatterns.pm b/lib/NGCP/Panel/Controller/API/NcosPatterns.pm index 014474b74d..60b2167c8d 100644 --- a/lib/NGCP/Panel/Controller/API/NcosPatterns.pm +++ b/lib/NGCP/Panel/Controller/API/NcosPatterns.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -63,7 +63,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/NcosPatternsItem.pm b/lib/NGCP/Panel/Controller/API/NcosPatternsItem.pm index d2caee4dcd..1ebd15e00c 100644 --- a/lib/NGCP/Panel/Controller/API/NcosPatternsItem.pm +++ b/lib/NGCP/Panel/Controller/API/NcosPatternsItem.pm @@ -10,7 +10,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -40,7 +40,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceConfigFiles.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceConfigFiles.pm index 5aeb20e022..791cdbbac7 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDeviceConfigFiles.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDeviceConfigFiles.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -52,7 +52,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceConfigFilesItem.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceConfigFilesItem.pm index 1a6c495171..6cec04a86d 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDeviceConfigFilesItem.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDeviceConfigFilesItem.pm @@ -10,7 +10,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -40,7 +40,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceConfigs.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceConfigs.pm index b7a0ed2aab..2eed20e9b9 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDeviceConfigs.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDeviceConfigs.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -85,7 +85,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceConfigsItem.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceConfigsItem.pm index f99e0738a7..fca5863f6f 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDeviceConfigsItem.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDeviceConfigsItem.pm @@ -10,7 +10,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -40,7 +40,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwareBinaries.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwareBinaries.pm index 64096b3fb3..ea99cfd35c 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwareBinaries.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwareBinaries.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -52,7 +52,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwareBinariesItem.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwareBinariesItem.pm index 7fbf816826..5c41eb871b 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwareBinariesItem.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwareBinariesItem.pm @@ -10,7 +10,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -40,7 +40,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwares.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwares.pm index c0993a9cfb..1d8f37a6d8 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwares.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwares.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -85,7 +85,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwaresItem.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwaresItem.pm index 3bcf717dbc..a38fd7d5d6 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwaresItem.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwaresItem.pm @@ -10,7 +10,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -40,7 +40,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceModelImages.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceModelImages.pm index 8768ee7924..030cbf8328 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDeviceModelImages.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDeviceModelImages.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -61,7 +61,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceModelImagesItem.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceModelImagesItem.pm index 879aa4914e..99ee1c6b34 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDeviceModelImagesItem.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDeviceModelImagesItem.pm @@ -10,7 +10,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -40,7 +40,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceModels.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceModels.pm index 6a654a9dc7..895ead147a 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDeviceModels.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDeviceModels.pm @@ -14,7 +14,7 @@ use NGCP::Panel::Utils::DeviceBootstrap; use NGCP::Panel::Utils::Device; require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -120,7 +120,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceModelsItem.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceModelsItem.pm index 978f9d584a..d1fe87d59a 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDeviceModelsItem.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDeviceModelsItem.pm @@ -14,7 +14,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); use Clone qw/clone/; require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -44,7 +44,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceProfiles.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceProfiles.pm index 27583031bf..8e2b7671ab 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDeviceProfiles.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDeviceProfiles.pm @@ -11,7 +11,7 @@ use TryCatch; use NGCP::Panel::Utils::DateTime; require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -73,7 +73,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceProfilesItem.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceProfilesItem.pm index 9ca77761e2..9891f47daa 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDeviceProfilesItem.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDeviceProfilesItem.pm @@ -13,7 +13,7 @@ use NGCP::Panel::Utils::DateTime; use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -43,7 +43,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/PbxDevices.pm b/lib/NGCP/Panel/Controller/API/PbxDevices.pm index fb3bdef58c..ea22fbd146 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDevices.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDevices.pm @@ -12,7 +12,7 @@ use NGCP::Panel::Utils::DateTime; use NGCP::Panel::Utils::DeviceBootstrap; require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -85,7 +85,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/PbxDevicesItem.pm b/lib/NGCP/Panel/Controller/API/PbxDevicesItem.pm index 297f8e23a9..196af7d30e 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDevicesItem.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDevicesItem.pm @@ -13,7 +13,7 @@ use NGCP::Panel::Utils::DateTime; use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -43,7 +43,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/PeeringGroups.pm b/lib/NGCP/Panel/Controller/API/PeeringGroups.pm index 33dd551142..d6ffc88103 100644 --- a/lib/NGCP/Panel/Controller/API/PeeringGroups.pm +++ b/lib/NGCP/Panel/Controller/API/PeeringGroups.pm @@ -16,7 +16,7 @@ use Safe::Isa qw($_isa); use parent qw/Catalyst::Controller NGCP::Panel::Role::API::PeeringGroups/;#Catalyst::Controller require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -65,7 +65,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/PeeringGroupsItem.pm b/lib/NGCP/Panel/Controller/API/PeeringGroupsItem.pm index 9e63d84c3b..0d73d18b91 100644 --- a/lib/NGCP/Panel/Controller/API/PeeringGroupsItem.pm +++ b/lib/NGCP/Panel/Controller/API/PeeringGroupsItem.pm @@ -11,7 +11,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); use parent qw/Catalyst::Controller NGCP::Panel::Role::API::PeeringGroups/; require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -29,7 +29,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/PeeringRules.pm b/lib/NGCP/Panel/Controller/API/PeeringRules.pm index 0d36a5082f..ea27fa2809 100644 --- a/lib/NGCP/Panel/Controller/API/PeeringRules.pm +++ b/lib/NGCP/Panel/Controller/API/PeeringRules.pm @@ -14,7 +14,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -86,7 +86,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/PeeringRulesItem.pm b/lib/NGCP/Panel/Controller/API/PeeringRulesItem.pm index adb392e08c..9b25ef8b56 100644 --- a/lib/NGCP/Panel/Controller/API/PeeringRulesItem.pm +++ b/lib/NGCP/Panel/Controller/API/PeeringRulesItem.pm @@ -10,7 +10,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -40,7 +40,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/PeeringServerPreferenceDefs.pm b/lib/NGCP/Panel/Controller/API/PeeringServerPreferenceDefs.pm index 614d9fdfc5..e10db3a861 100644 --- a/lib/NGCP/Panel/Controller/API/PeeringServerPreferenceDefs.pm +++ b/lib/NGCP/Panel/Controller/API/PeeringServerPreferenceDefs.pm @@ -15,7 +15,7 @@ use Safe::Isa qw($_isa); use JSON::Types qw(); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -45,7 +45,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/PeeringServerPreferences.pm b/lib/NGCP/Panel/Controller/API/PeeringServerPreferences.pm index a36030d3b5..9643c42d6b 100644 --- a/lib/NGCP/Panel/Controller/API/PeeringServerPreferences.pm +++ b/lib/NGCP/Panel/Controller/API/PeeringServerPreferences.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -47,7 +47,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/PeeringServerPreferencesItem.pm b/lib/NGCP/Panel/Controller/API/PeeringServerPreferencesItem.pm index ff080800fe..3b6310c528 100644 --- a/lib/NGCP/Panel/Controller/API/PeeringServerPreferencesItem.pm +++ b/lib/NGCP/Panel/Controller/API/PeeringServerPreferencesItem.pm @@ -13,7 +13,7 @@ use NGCP::Panel::Utils::DateTime; use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -53,7 +53,7 @@ __PACKAGE__->config( Does => [qw(ACL RequireSSL)], }) } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/PeeringServers.pm b/lib/NGCP/Panel/Controller/API/PeeringServers.pm index 2ea8783a57..7788cf03b4 100644 --- a/lib/NGCP/Panel/Controller/API/PeeringServers.pm +++ b/lib/NGCP/Panel/Controller/API/PeeringServers.pm @@ -14,7 +14,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -107,7 +107,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/PeeringServersItem.pm b/lib/NGCP/Panel/Controller/API/PeeringServersItem.pm index cb45564241..07f225561f 100644 --- a/lib/NGCP/Panel/Controller/API/PeeringServersItem.pm +++ b/lib/NGCP/Panel/Controller/API/PeeringServersItem.pm @@ -10,7 +10,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -40,7 +40,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/ProfilePackages.pm b/lib/NGCP/Panel/Controller/API/ProfilePackages.pm index f21f997d41..85aa2519be 100644 --- a/lib/NGCP/Panel/Controller/API/ProfilePackages.pm +++ b/lib/NGCP/Panel/Controller/API/ProfilePackages.pm @@ -13,7 +13,7 @@ use NGCP::Panel::Utils::ProfilePackages qw(); use Path::Tiny qw(path); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -101,7 +101,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/ProfilePackagesItem.pm b/lib/NGCP/Panel/Controller/API/ProfilePackagesItem.pm index 686f92822e..5c3444b49f 100644 --- a/lib/NGCP/Panel/Controller/API/ProfilePackagesItem.pm +++ b/lib/NGCP/Panel/Controller/API/ProfilePackagesItem.pm @@ -9,7 +9,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -49,7 +49,7 @@ __PACKAGE__->config( Does => [qw(ACL RequireSSL)], }) } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/ProfilePreferenceDefs.pm b/lib/NGCP/Panel/Controller/API/ProfilePreferenceDefs.pm index 30e74198e7..7af202373c 100644 --- a/lib/NGCP/Panel/Controller/API/ProfilePreferenceDefs.pm +++ b/lib/NGCP/Panel/Controller/API/ProfilePreferenceDefs.pm @@ -15,7 +15,7 @@ use Safe::Isa qw($_isa); use JSON::Types qw(); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -45,7 +45,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/ProfilePreferences.pm b/lib/NGCP/Panel/Controller/API/ProfilePreferences.pm index 46b7a37916..26696eeacf 100644 --- a/lib/NGCP/Panel/Controller/API/ProfilePreferences.pm +++ b/lib/NGCP/Panel/Controller/API/ProfilePreferences.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -47,7 +47,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/ProfilePreferencesItem.pm b/lib/NGCP/Panel/Controller/API/ProfilePreferencesItem.pm index 52376abf0c..5c56ac4d2c 100644 --- a/lib/NGCP/Panel/Controller/API/ProfilePreferencesItem.pm +++ b/lib/NGCP/Panel/Controller/API/ProfilePreferencesItem.pm @@ -13,7 +13,7 @@ use NGCP::Panel::Utils::DateTime; use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -53,7 +53,7 @@ __PACKAGE__->config( Does => [qw(ACL RequireSSL)], }) } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/Reminders.pm b/lib/NGCP/Panel/Controller/API/Reminders.pm index 2edb8ad328..23519f4cb1 100644 --- a/lib/NGCP/Panel/Controller/API/Reminders.pm +++ b/lib/NGCP/Panel/Controller/API/Reminders.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -67,7 +67,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/RemindersItem.pm b/lib/NGCP/Panel/Controller/API/RemindersItem.pm index 4b190e3551..ee9dda482d 100644 --- a/lib/NGCP/Panel/Controller/API/RemindersItem.pm +++ b/lib/NGCP/Panel/Controller/API/RemindersItem.pm @@ -10,7 +10,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -50,7 +50,7 @@ __PACKAGE__->config( Does => [qw(ACL RequireSSL)], }) } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/Resellers.pm b/lib/NGCP/Panel/Controller/API/Resellers.pm index 7a5ab9c878..b4e9e30b87 100644 --- a/lib/NGCP/Panel/Controller/API/Resellers.pm +++ b/lib/NGCP/Panel/Controller/API/Resellers.pm @@ -15,7 +15,7 @@ use NGCP::Panel::Utils::Rtc; use Path::Tiny qw(path); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -65,7 +65,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/ResellersItem.pm b/lib/NGCP/Panel/Controller/API/ResellersItem.pm index 50ba86a15e..07945d7cea 100644 --- a/lib/NGCP/Panel/Controller/API/ResellersItem.pm +++ b/lib/NGCP/Panel/Controller/API/ResellersItem.pm @@ -10,7 +10,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -50,7 +50,7 @@ __PACKAGE__->config( Does => [qw(ACL RequireSSL)], }) } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/RewriteRuleSets.pm b/lib/NGCP/Panel/Controller/API/RewriteRuleSets.pm index 40fe4bf19c..724ea51a4b 100644 --- a/lib/NGCP/Panel/Controller/API/RewriteRuleSets.pm +++ b/lib/NGCP/Panel/Controller/API/RewriteRuleSets.pm @@ -14,7 +14,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -86,7 +86,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/RewriteRuleSetsItem.pm b/lib/NGCP/Panel/Controller/API/RewriteRuleSetsItem.pm index 0f7eaf9821..8e96854bdf 100644 --- a/lib/NGCP/Panel/Controller/API/RewriteRuleSetsItem.pm +++ b/lib/NGCP/Panel/Controller/API/RewriteRuleSetsItem.pm @@ -14,7 +14,7 @@ use NGCP::Panel::Utils::Rewrite; use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -44,7 +44,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/RewriteRules.pm b/lib/NGCP/Panel/Controller/API/RewriteRules.pm index abbfd75221..75decc1b15 100644 --- a/lib/NGCP/Panel/Controller/API/RewriteRules.pm +++ b/lib/NGCP/Panel/Controller/API/RewriteRules.pm @@ -12,7 +12,7 @@ use NGCP::Panel::Utils::DateTime; use NGCP::Panel::Utils::Rewrite; require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -85,7 +85,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/RewriteRulesItem.pm b/lib/NGCP/Panel/Controller/API/RewriteRulesItem.pm index e3ef4aea3f..007d3d6848 100644 --- a/lib/NGCP/Panel/Controller/API/RewriteRulesItem.pm +++ b/lib/NGCP/Panel/Controller/API/RewriteRulesItem.pm @@ -14,7 +14,7 @@ use NGCP::Panel::Utils::Rewrite; use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -44,7 +44,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/Root.pm b/lib/NGCP/Panel/Controller/API/Root.pm index 237665f953..7eb1074b3c 100644 --- a/lib/NGCP/Panel/Controller/API/Root.pm +++ b/lib/NGCP/Panel/Controller/API/Root.pm @@ -14,7 +14,7 @@ use TryCatch; use parent qw/Catalyst::Controller NGCP::Panel::Role::API/; require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; use NGCP::Panel::Utils::Journal qw(); @@ -37,12 +37,12 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { my ($self, $c) = @_; - + $self->set_body($c); $self->log_request($c); return 1; @@ -176,7 +176,7 @@ sub GET : Allow { } $c->stash->{collections}->{$rel} = { - name => $mod, + name => $mod, description => $full_mod->api_description, fields => $form_fields, uploads => $form_fields_upload, @@ -190,7 +190,7 @@ sub GET : Allow { %$documentation_sample, journal_resource_config => $journal_resource_config, }; - + } $c->stash(template => 'api/root.tt'); @@ -271,11 +271,11 @@ sub invalid_user : Private { sub field_to_json : Private { my ($self, $field) = @_; - + if ($field->$_isa('HTML::FormHandler::Field::Select')) { - return $self->field_to_select_options($field); + return $self->field_to_select_options($field); } # elsif { ... } - + SWITCH: for ($field->type) { /Float|Integer|Money|PosInteger|Minute|Hour|MonthDay|Year/ && @@ -285,7 +285,7 @@ sub field_to_json : Private { /Repeatable/ && return "Array"; /\+NGCP::Panel::Field::Select/ && - return $self->field_to_select_options($field); + return $self->field_to_select_options($field); /\+NGCP::Panel::Field::Regex/ && return "String"; /\+NGCP::Panel::Field::DateTime/ && @@ -299,7 +299,7 @@ sub field_to_json : Private { /\+NGCP::Panel::Field::URI/ && return "String"; /\+NGCP::Panel::Field::IPAddress/ && - return "String"; + return "String"; /\+NGCP::Panel::Field::E164/ && return "Object"; /Compound/ && @@ -311,9 +311,9 @@ sub field_to_json : Private { /\+NGCP::Panel::Field::PbxGroupMemberAPI/ && return "Array"; /\+NGCP::Panel::Field::Interval/ && - return "Object"; + return "Object"; /\+NGCP::Panel::Field::DatePicker/ && - return "String"; + return "String"; # usually {xxx}{id} /\+NGCP::Panel::Field::/ && return "Number"; @@ -335,12 +335,12 @@ sub field_to_select_options : Private { } $s; } @{$field->options}); - + } sub get_field_poperties :Private{ my ($self, $field) = @_; my $name = $field->name; - + return () if ( $field->type eq "Hidden" || $field->type eq "Button" || @@ -374,7 +374,7 @@ sub get_field_poperties :Private{ } unless (defined $desc && length($desc) > 0) { $desc = 'to be described ...'; - } + } return { name => $name, description => $desc, types => \@types, type_original => $field->type }; } sub get_collection_properties { @@ -382,7 +382,7 @@ sub get_collection_properties { my $renderlist = $form->form->blocks->{fields}->{render_list}; my %renderlist = defined $renderlist ? map { $_ => 1 } @{$renderlist} : (); - + my @props = (); my @uploads = (); foreach my $f($form->fields) { @@ -406,7 +406,7 @@ sub get_collection_properties { sub end : Private { my ($self, $c) = @_; - + #$self->log_response($c); return 1; } diff --git a/lib/NGCP/Panel/Controller/API/RtcNetworks.pm b/lib/NGCP/Panel/Controller/API/RtcNetworks.pm index f63020323d..c1dafa0662 100644 --- a/lib/NGCP/Panel/Controller/API/RtcNetworks.pm +++ b/lib/NGCP/Panel/Controller/API/RtcNetworks.pm @@ -8,7 +8,7 @@ use HTTP::Headers qw(); use HTTP::Status qw(:constants); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; @@ -47,7 +47,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/RtcNetworksItem.pm b/lib/NGCP/Panel/Controller/API/RtcNetworksItem.pm index ba0bd33243..4a186181bf 100644 --- a/lib/NGCP/Panel/Controller/API/RtcNetworksItem.pm +++ b/lib/NGCP/Panel/Controller/API/RtcNetworksItem.pm @@ -5,7 +5,7 @@ use Data::HAL::Link qw(); use HTTP::Headers qw(); use HTTP::Status qw(:constants); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -43,7 +43,7 @@ __PACKAGE__->config( Does => [qw(ACL RequireSSL)], }) }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/RtcSessions.pm b/lib/NGCP/Panel/Controller/API/RtcSessions.pm index 00cdc7569a..7062ea248e 100644 --- a/lib/NGCP/Panel/Controller/API/RtcSessions.pm +++ b/lib/NGCP/Panel/Controller/API/RtcSessions.pm @@ -9,7 +9,7 @@ use HTTP::Status qw(:constants); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; @@ -48,7 +48,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/RtcSessionsItem.pm b/lib/NGCP/Panel/Controller/API/RtcSessionsItem.pm index 97312da9d1..78787a85ed 100644 --- a/lib/NGCP/Panel/Controller/API/RtcSessionsItem.pm +++ b/lib/NGCP/Panel/Controller/API/RtcSessionsItem.pm @@ -7,7 +7,7 @@ use HTTP::Headers qw(); use HTTP::Status qw(:constants); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; use parent qw/Catalyst::Controller NGCP::Panel::Role::API::RtcSessions/; @@ -51,7 +51,7 @@ __PACKAGE__->config( Does => [qw(ACL RequireSSL)], }) }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/SoundFileRecordings.pm b/lib/NGCP/Panel/Controller/API/SoundFileRecordings.pm index e881445b38..70fa18e064 100644 --- a/lib/NGCP/Panel/Controller/API/SoundFileRecordings.pm +++ b/lib/NGCP/Panel/Controller/API/SoundFileRecordings.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -52,7 +52,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/SoundFileRecordingsItem.pm b/lib/NGCP/Panel/Controller/API/SoundFileRecordingsItem.pm index fcb2071b48..c81c487368 100644 --- a/lib/NGCP/Panel/Controller/API/SoundFileRecordingsItem.pm +++ b/lib/NGCP/Panel/Controller/API/SoundFileRecordingsItem.pm @@ -10,7 +10,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -40,7 +40,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/SoundFiles.pm b/lib/NGCP/Panel/Controller/API/SoundFiles.pm index 82bfefa1bd..caf2cb65a1 100644 --- a/lib/NGCP/Panel/Controller/API/SoundFiles.pm +++ b/lib/NGCP/Panel/Controller/API/SoundFiles.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -64,7 +64,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/SoundFilesItem.pm b/lib/NGCP/Panel/Controller/API/SoundFilesItem.pm index 0ea2858f29..d6b64b2aa4 100644 --- a/lib/NGCP/Panel/Controller/API/SoundFilesItem.pm +++ b/lib/NGCP/Panel/Controller/API/SoundFilesItem.pm @@ -10,7 +10,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -40,7 +40,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/SoundHandles.pm b/lib/NGCP/Panel/Controller/API/SoundHandles.pm index 8ab96eebfc..71e10226da 100644 --- a/lib/NGCP/Panel/Controller/API/SoundHandles.pm +++ b/lib/NGCP/Panel/Controller/API/SoundHandles.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -65,7 +65,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/SoundHandlesItem.pm b/lib/NGCP/Panel/Controller/API/SoundHandlesItem.pm index 4a03fa4594..a190a4dc62 100644 --- a/lib/NGCP/Panel/Controller/API/SoundHandlesItem.pm +++ b/lib/NGCP/Panel/Controller/API/SoundHandlesItem.pm @@ -10,7 +10,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -40,7 +40,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/SoundSets.pm b/lib/NGCP/Panel/Controller/API/SoundSets.pm index ef78edc956..b09dacddb2 100644 --- a/lib/NGCP/Panel/Controller/API/SoundSets.pm +++ b/lib/NGCP/Panel/Controller/API/SoundSets.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -85,7 +85,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/SoundSetsItem.pm b/lib/NGCP/Panel/Controller/API/SoundSetsItem.pm index b36d669669..016ed28369 100644 --- a/lib/NGCP/Panel/Controller/API/SoundSetsItem.pm +++ b/lib/NGCP/Panel/Controller/API/SoundSetsItem.pm @@ -10,7 +10,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -50,7 +50,7 @@ __PACKAGE__->config( Does => [qw(ACL RequireSSL)], }) } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/SpeedDials.pm b/lib/NGCP/Panel/Controller/API/SpeedDials.pm index aa8cd0d147..4b8c03db90 100644 --- a/lib/NGCP/Panel/Controller/API/SpeedDials.pm +++ b/lib/NGCP/Panel/Controller/API/SpeedDials.pm @@ -16,7 +16,7 @@ use Safe::Isa qw($_isa); use UUID; require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -69,7 +69,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/SpeedDialsItem.pm b/lib/NGCP/Panel/Controller/API/SpeedDialsItem.pm index 83dc3d33a9..d07569fb9e 100644 --- a/lib/NGCP/Panel/Controller/API/SpeedDialsItem.pm +++ b/lib/NGCP/Panel/Controller/API/SpeedDialsItem.pm @@ -13,7 +13,7 @@ use NGCP::Panel::Utils::DateTime; use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -53,7 +53,7 @@ __PACKAGE__->config( Does => [qw(ACL RequireSSL)], }) } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/SubscriberPreferenceDefs.pm b/lib/NGCP/Panel/Controller/API/SubscriberPreferenceDefs.pm index 94bf1096c9..5827349105 100644 --- a/lib/NGCP/Panel/Controller/API/SubscriberPreferenceDefs.pm +++ b/lib/NGCP/Panel/Controller/API/SubscriberPreferenceDefs.pm @@ -15,7 +15,7 @@ use Safe::Isa qw($_isa); use JSON::Types qw(); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -45,7 +45,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/SubscriberPreferences.pm b/lib/NGCP/Panel/Controller/API/SubscriberPreferences.pm index 2201d182c7..eacabf0bb9 100644 --- a/lib/NGCP/Panel/Controller/API/SubscriberPreferences.pm +++ b/lib/NGCP/Panel/Controller/API/SubscriberPreferences.pm @@ -14,7 +14,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -77,7 +77,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/SubscriberPreferencesItem.pm b/lib/NGCP/Panel/Controller/API/SubscriberPreferencesItem.pm index 0b7a100707..ebd7e02504 100644 --- a/lib/NGCP/Panel/Controller/API/SubscriberPreferencesItem.pm +++ b/lib/NGCP/Panel/Controller/API/SubscriberPreferencesItem.pm @@ -14,7 +14,7 @@ use NGCP::Panel::Utils::ProfilePackages qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -54,7 +54,7 @@ __PACKAGE__->config( Does => [qw(ACL RequireSSL)], }) } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/SubscriberProfileSets.pm b/lib/NGCP/Panel/Controller/API/SubscriberProfileSets.pm index ef530b8fc2..0ec72c3f5a 100644 --- a/lib/NGCP/Panel/Controller/API/SubscriberProfileSets.pm +++ b/lib/NGCP/Panel/Controller/API/SubscriberProfileSets.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -74,7 +74,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/SubscriberProfileSetsItem.pm b/lib/NGCP/Panel/Controller/API/SubscriberProfileSetsItem.pm index dddd855494..65308a839f 100644 --- a/lib/NGCP/Panel/Controller/API/SubscriberProfileSetsItem.pm +++ b/lib/NGCP/Panel/Controller/API/SubscriberProfileSetsItem.pm @@ -10,7 +10,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -50,7 +50,7 @@ __PACKAGE__->config( Does => [qw(ACL RequireSSL)], }) } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/SubscriberProfiles.pm b/lib/NGCP/Panel/Controller/API/SubscriberProfiles.pm index a40914792c..85b36cba0e 100644 --- a/lib/NGCP/Panel/Controller/API/SubscriberProfiles.pm +++ b/lib/NGCP/Panel/Controller/API/SubscriberProfiles.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -74,7 +74,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/SubscriberProfilesItem.pm b/lib/NGCP/Panel/Controller/API/SubscriberProfilesItem.pm index 42ce0831e2..1ca594ae48 100644 --- a/lib/NGCP/Panel/Controller/API/SubscriberProfilesItem.pm +++ b/lib/NGCP/Panel/Controller/API/SubscriberProfilesItem.pm @@ -10,7 +10,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -50,7 +50,7 @@ __PACKAGE__->config( Does => [qw(ACL RequireSSL)], }) } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/SubscriberRegistrations.pm b/lib/NGCP/Panel/Controller/API/SubscriberRegistrations.pm index 282de72d6f..2fe2185566 100644 --- a/lib/NGCP/Panel/Controller/API/SubscriberRegistrations.pm +++ b/lib/NGCP/Panel/Controller/API/SubscriberRegistrations.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -83,7 +83,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/SubscriberRegistrationsItem.pm b/lib/NGCP/Panel/Controller/API/SubscriberRegistrationsItem.pm index e392aa636f..0f466d42aa 100644 --- a/lib/NGCP/Panel/Controller/API/SubscriberRegistrationsItem.pm +++ b/lib/NGCP/Panel/Controller/API/SubscriberRegistrationsItem.pm @@ -10,7 +10,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -40,7 +40,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/Subscribers.pm b/lib/NGCP/Panel/Controller/API/Subscribers.pm index f15c13a57f..abb63b30db 100644 --- a/lib/NGCP/Panel/Controller/API/Subscribers.pm +++ b/lib/NGCP/Panel/Controller/API/Subscribers.pm @@ -17,7 +17,7 @@ use Safe::Isa qw($_isa); use UUID; require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -241,7 +241,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/SubscribersItem.pm b/lib/NGCP/Panel/Controller/API/SubscribersItem.pm index 9029988472..4c0aa4a165 100644 --- a/lib/NGCP/Panel/Controller/API/SubscribersItem.pm +++ b/lib/NGCP/Panel/Controller/API/SubscribersItem.pm @@ -14,7 +14,7 @@ use NGCP::Panel::Utils::ProfilePackages qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -54,7 +54,7 @@ __PACKAGE__->config( Does => [qw(ACL RequireSSL)], }) } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/SystemContacts.pm b/lib/NGCP/Panel/Controller/API/SystemContacts.pm index 1a2a505afc..8a3ad82055 100644 --- a/lib/NGCP/Panel/Controller/API/SystemContacts.pm +++ b/lib/NGCP/Panel/Controller/API/SystemContacts.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -63,7 +63,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/SystemContactsItem.pm b/lib/NGCP/Panel/Controller/API/SystemContactsItem.pm index e9f3aad647..78a4cae207 100644 --- a/lib/NGCP/Panel/Controller/API/SystemContactsItem.pm +++ b/lib/NGCP/Panel/Controller/API/SystemContactsItem.pm @@ -10,7 +10,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -50,7 +50,7 @@ __PACKAGE__->config( Does => [qw(ACL RequireSSL)], }) } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/TopupCash.pm b/lib/NGCP/Panel/Controller/API/TopupCash.pm index fe5988fa49..c0320fc862 100644 --- a/lib/NGCP/Panel/Controller/API/TopupCash.pm +++ b/lib/NGCP/Panel/Controller/API/TopupCash.pm @@ -15,7 +15,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -56,7 +56,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/TopupLogs.pm b/lib/NGCP/Panel/Controller/API/TopupLogs.pm index 6a93009cf5..2cc40f60d9 100644 --- a/lib/NGCP/Panel/Controller/API/TopupLogs.pm +++ b/lib/NGCP/Panel/Controller/API/TopupLogs.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -168,7 +168,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/TopupLogsItem.pm b/lib/NGCP/Panel/Controller/API/TopupLogsItem.pm index 3eb1636236..47d2c32dcb 100644 --- a/lib/NGCP/Panel/Controller/API/TopupLogsItem.pm +++ b/lib/NGCP/Panel/Controller/API/TopupLogsItem.pm @@ -10,7 +10,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -40,7 +40,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/TopupVouchers.pm b/lib/NGCP/Panel/Controller/API/TopupVouchers.pm index 2c842437d0..daf3bd84bd 100644 --- a/lib/NGCP/Panel/Controller/API/TopupVouchers.pm +++ b/lib/NGCP/Panel/Controller/API/TopupVouchers.pm @@ -15,7 +15,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -56,7 +56,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/TrustedSources.pm b/lib/NGCP/Panel/Controller/API/TrustedSources.pm index 44b2faead8..55832011b0 100644 --- a/lib/NGCP/Panel/Controller/API/TrustedSources.pm +++ b/lib/NGCP/Panel/Controller/API/TrustedSources.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -67,7 +67,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/TrustedSourcesItem.pm b/lib/NGCP/Panel/Controller/API/TrustedSourcesItem.pm index b815b16152..ee8fb00a7b 100644 --- a/lib/NGCP/Panel/Controller/API/TrustedSourcesItem.pm +++ b/lib/NGCP/Panel/Controller/API/TrustedSourcesItem.pm @@ -10,7 +10,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -50,7 +50,7 @@ __PACKAGE__->config( Does => [qw(ACL RequireSSL)], }) } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/VoicemailRecordings.pm b/lib/NGCP/Panel/Controller/API/VoicemailRecordings.pm index 2381d92aa0..61a44f4f3a 100644 --- a/lib/NGCP/Panel/Controller/API/VoicemailRecordings.pm +++ b/lib/NGCP/Panel/Controller/API/VoicemailRecordings.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -47,7 +47,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods }, }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/VoicemailRecordingsItem.pm b/lib/NGCP/Panel/Controller/API/VoicemailRecordingsItem.pm index c7b36a8c67..118b5157a6 100644 --- a/lib/NGCP/Panel/Controller/API/VoicemailRecordingsItem.pm +++ b/lib/NGCP/Panel/Controller/API/VoicemailRecordingsItem.pm @@ -10,7 +10,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -40,7 +40,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/VoicemailSettings.pm b/lib/NGCP/Panel/Controller/API/VoicemailSettings.pm index 3d630d20a2..eb0e2d5c76 100644 --- a/lib/NGCP/Panel/Controller/API/VoicemailSettings.pm +++ b/lib/NGCP/Panel/Controller/API/VoicemailSettings.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -67,7 +67,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/VoicemailSettingsItem.pm b/lib/NGCP/Panel/Controller/API/VoicemailSettingsItem.pm index 0c4d3a0f99..3337fa8ad8 100644 --- a/lib/NGCP/Panel/Controller/API/VoicemailSettingsItem.pm +++ b/lib/NGCP/Panel/Controller/API/VoicemailSettingsItem.pm @@ -10,7 +10,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -50,7 +50,7 @@ __PACKAGE__->config( Does => [qw(ACL RequireSSL)], }) } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/Voicemails.pm b/lib/NGCP/Panel/Controller/API/Voicemails.pm index 2ca40ae59f..14ad966d5c 100644 --- a/lib/NGCP/Panel/Controller/API/Voicemails.pm +++ b/lib/NGCP/Panel/Controller/API/Voicemails.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -76,7 +76,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/VoicemailsItem.pm b/lib/NGCP/Panel/Controller/API/VoicemailsItem.pm index b871000f61..5e81fbc111 100644 --- a/lib/NGCP/Panel/Controller/API/VoicemailsItem.pm +++ b/lib/NGCP/Panel/Controller/API/VoicemailsItem.pm @@ -11,7 +11,7 @@ use NGCP::Panel::Utils::Subscriber; use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -41,7 +41,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/Vouchers.pm b/lib/NGCP/Panel/Controller/API/Vouchers.pm index 22713e3882..3cb3120215 100644 --- a/lib/NGCP/Panel/Controller/API/Vouchers.pm +++ b/lib/NGCP/Panel/Controller/API/Vouchers.pm @@ -13,7 +13,7 @@ use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; require Catalyst::ActionRole::CheckTrailingSlash; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -73,7 +73,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Controller/API/VouchersItem.pm b/lib/NGCP/Panel/Controller/API/VouchersItem.pm index 342074bef7..15faade2a4 100644 --- a/lib/NGCP/Panel/Controller/API/VouchersItem.pm +++ b/lib/NGCP/Panel/Controller/API/VouchersItem.pm @@ -10,7 +10,7 @@ use NGCP::Panel::Utils::ValidateJSON qw(); use Path::Tiny qw(path); use Safe::Isa qw($_isa); require Catalyst::ActionRole::ACL; -require Catalyst::ActionRole::HTTPMethods; +require NGCP::Panel::Role::HTTPMethods; require Catalyst::ActionRole::RequireSSL; sub allowed_methods{ @@ -40,7 +40,7 @@ __PACKAGE__->config( Path => __PACKAGE__->dispatch_path, } } @{ __PACKAGE__->allowed_methods } }, - action_roles => [qw(HTTPMethods)], + action_roles => [qw(+NGCP::Panel::Role::HTTPMethods)], ); sub auto :Private { diff --git a/lib/NGCP/Panel/Role/HTTPMethods.pm b/lib/NGCP/Panel/Role/HTTPMethods.pm new file mode 100644 index 0000000000..cc5da30d7f --- /dev/null +++ b/lib/NGCP/Panel/Role/HTTPMethods.pm @@ -0,0 +1,47 @@ +package NGCP::Panel::Role::HTTPMethods; + +#this is duplicated from Catalyst::ActionRole::HTTPMethods +#which is still present with Catalyst::Controller. +#therefore methods required the 'ngcp_' prefix in order to +#avoid naming conflicts. + +use Moose::Role; + +requires 'match', 'match_captures', 'list_extra_info'; + +around ['match','match_captures'] => sub { + my ($orig, $self, $ctx, @args) = @_; + #my $expected = $ctx->req->method; + my $expected = $self->_ngcp_normalize_expected_http_method($ctx->req); + return $self->_ngcp_has_expected_http_method($expected) ? + $self->$orig($ctx, @args) : + 0; +}; + +sub _ngcp_normalize_expected_http_method { + my ($self, $req) = @_; + return $req->header('X-HTTP-Method') || + $req->header('X-HTTP-Method-Override') || + $req->header('X-METHOD-OVERRIDE') || + $req->header('x-tunneled-method') || + $req->method; +} + +sub _ngcp_has_expected_http_method { + my ($self, $expected) = @_; + return 1 unless scalar(my @allowed = $self->ngcp_allowed_http_methods); + return scalar(grep { lc($_) eq lc($expected) } @allowed) ? + 1 : 0; +} + +sub ngcp_allowed_http_methods { @{shift->attributes->{Method}||[]} } + +around 'list_extra_info' => sub { + my ($orig, $self, @args) = @_; + return { + %{ $self->$orig(@args) }, + HTTP_METHODS => [sort $self->ngcp_allowed_http_methods], + }; +}; + +1; diff --git a/t/api-rest/api-method-override.t b/t/api-rest/api-method-override.t new file mode 100644 index 0000000000..6dba4cdea2 --- /dev/null +++ b/t/api-rest/api-method-override.t @@ -0,0 +1,105 @@ +use Sipwise::Base; +use Net::Domain qw(hostfqdn); +use LWP::UserAgent; +use JSON qw(); +use Test::More; + +my $is_local_env = 0; + +my $uri = $ENV{CATALYST_SERVER} || ('https://'.hostfqdn.':4443'); +my ($netloc) = ($uri =~ m!^https?://(.*)/?.*$!); + +my ($ua, $req, $res); +$ua = LWP::UserAgent->new; + +$ua->ssl_opts( + verify_hostname => 0, + SSL_verify_mode => 0, + ); +my $user = $ENV{API_USER} // 'administrator'; +my $pass = $ENV{API_PASS} // 'administrator'; +$ua->credentials($netloc, "api_admin_http", $user, $pass); + +#$ua->add_handler("request_send", sub { +# my ($request, $ua, $h) = @_; +# print $request->method . ' ' . $request->uri . "\n" . ($request->content ? $request->content . "\n" : '') unless $request->header('authorization'); +# return undef; +#}); +#$ua->add_handler("response_done", sub { +# my ($response, $ua, $h) = @_; +# print $response->decoded_content . "\n" if $response->code != 401; +# return undef; +#}); + +my $t = time; +my $reseller_id = 1; + +$req = HTTP::Request->new('POST', $uri.'/api/billingprofiles/'); +$req->header('Content-Type' => 'application/json'); +$req->header('Prefer' => 'return=representation'); +$req->content(JSON::to_json({ + name => "test profile $t", + handle => "testprofile$t", + reseller_id => $reseller_id, +})); +$res = $ua->request($req); +is($res->code, 201, "create test billing profile"); +$req = HTTP::Request->new('GET', $uri.'/'.$res->header('Location')); +$res = $ua->request($req); +is($res->code, 200, "fetch test billing profile"); +my $billing_profile = JSON::from_json($res->decoded_content); + +# first, create a contact +$req = HTTP::Request->new('POST', $uri.'/api/customercontacts/'); +$req->header('Content-Type' => 'application/json'); +$req->content(JSON::to_json({ + firstname => "cust_contact_first", + lastname => "cust_contact_last", + email => "cust_contact\@custcontact.invalid", + reseller_id => $reseller_id, +})); +$res = $ua->request($req); +is($res->code, 201, "create customer contact"); +$req = HTTP::Request->new('GET', $uri.'/'.$res->header('Location')); +$res = $ua->request($req); +is($res->code, 200, "fetch customer contact"); +my $custcontact = JSON::from_json($res->decoded_content); + +{ + + $req = HTTP::Request->new('POST', $uri.'/api/customers/'); + $req->header('Content-Type' => 'application/json'); + $req->content(JSON::to_json({ + status => "active", + contact_id => $custcontact->{id}, + type => "sipaccount", + billing_profile_id => $billing_profile->{id}, + max_subscribers => undef, + external_id => undef, + })); + $res = $ua->request($req); + is($res->code, 201, "create test customer"); + $req = HTTP::Request->new('GET', $uri.'/'.$res->header('Location')); + $res = $ua->request($req); + is($res->code, 200, "fetch test customer"); + my $customer = JSON::from_json($res->decoded_content); + + #curl -X DELETE -H 'Connection: close' -H 'Content-Type: application/json-patch+json' -H 'X-HTTP-Method-Override: PATCH' 'https://127.0.0.1:1443/api/customers/3' -k -u administrator:administrator --data-binary '[{ "op" : "replace", "path" : "/status", "value" : "terminated" }]' + + $req = HTTP::Request->new('DELETE', $uri.'/api/customers/'.$customer->{id}); + $req->header('Prefer' => 'return=representation'); + $req->header('Content-Type' => 'application/json-patch+json'); + $req->header('x-tunneled-method' => 'PATCH'); + + $req->content(JSON::to_json( + [ { op => 'replace', path => '/status', value => 'terminated' } ] + )); + $res = $ua->request($req); + is($res->code, 200, "patch customer test customer with DELETE"); + my $mod_customer = JSON::from_json($res->decoded_content); + + is($mod_customer->{status}, 'terminated','test customer successfully terminated'); + +} + +done_testing;