openinfra
/
openstackid-resources
Code Issues Proposed changes

Laravel upgrade 

* from 5.6.x to 5.7.x
* from 5.7.x to 5.8.x
* from 5.8.x to 6.x
* from 6.x to 7.x
* from 7.x to 8.x
* php 7.4 support
* mysql 8.x support

Change-Id: I10a0a626363be3769ba70653b4943eaa2f2fb0b7
Signed-off-by: smarcet <smarcet@gmail.com>
This commit is contained in:
smarcet 2021-02-23 13:38:43 -03:00 committed by smarcet@gmail.com
parent 81433f99fe
commit 1384e792cf
355 changed files with 8184 additions and 7783 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -27,4 +27,5 @@ storage/*
routes.txt
/storage/logs/
/ss.sql
phpunit.xml
phpunit.xml
/.phpunit.result.cache

54
Libs/Utils/CustomDoctrineServiceProvider.php
View File

@ -1,54 +0,0 @@
<?php namespace libs\utils;
/**
* Copyright 2016 OpenStack Foundation
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
**/
use Doctrine\Common\Persistence\ManagerRegistry;
use Illuminate\Contracts\Container\Container;
use LaravelDoctrine\ORM\BootChain;
use LaravelDoctrine\ORM\DoctrineServiceProvider;
use LaravelDoctrine\ORM\IlluminateRegistry;
/**
* Class CustomDoctrineServiceProvider
* @package libs\utils
*/
final class CustomDoctrineServiceProvider extends DoctrineServiceProvider
{
/**
* Register the manager registry
*/
protected function registerManagerRegistry()
{
$this->app->singleton('registry', function ($app) {
$registry = new IlluminateRegistry($app, $app->make(CustomEntityManagerFactory::class));
// Add all managers into the registry
foreach ($app->make('config')->get('doctrine.managers', []) as $manager => $settings) {
$registry->addManager($manager, $settings);
}
return $registry;
});
// Once the registry get's resolved, we will call the resolve callbacks which were waiting for the registry
$this->app->afterResolving('registry', function (ManagerRegistry $registry, Container $container) {
$this->bootExtensionManager();
BootChain::boot($registry);
});
$this->app->alias('registry', ManagerRegistry::class);
$this->app->alias('registry', IlluminateRegistry::class);
}
}

88
Libs/Utils/CustomEntityManagerFactory.php
View File

@ -1,88 +0,0 @@
<?php namespace libs\utils;
/**
* Copyright 2016 OpenStack Foundation
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
**/
use Doctrine\ORM\Cache\DefaultCacheFactory;
use Doctrine\ORM\Cache\Logging\StatisticsCacheLogger;
use Doctrine\ORM\Cache\RegionsConfiguration;
use Doctrine\ORM\Configuration;
use LaravelDoctrine\ORM\EntityManagerFactory;
/**
* Class CustomEntityManagerFactory
* @package libs\utils
*/
final class CustomEntityManagerFactory extends EntityManagerFactory
{
/**
* @param Configuration $configuration
*/
protected function setSecondLevelCaching(Configuration $configuration)
{
$second_level_cache_config = $this->config->get('doctrine.cache.second_level', []);
if (!is_array($second_level_cache_config)) return;
if (!isset($second_level_cache_config['enabled'])) return;
if (!$second_level_cache_config['enabled']) return;
$configuration->setSecondLevelCacheEnabled(true);
$cacheConfig = $configuration->getSecondLevelCacheConfiguration();
$regions_config = isset($second_level_cache_config['regions']) ? $second_level_cache_config['regions'] : [];
if (is_array($regions_config) && count($regions_config) > 0) {
$regions_configuration = new RegionsConfiguration
(
isset($second_level_cache_config['region_lifetime']) ? $second_level_cache_config['region_lifetime'] : 3600,
isset($second_level_cache_config['region_lock_lifetime']) ? $second_level_cache_config['region_lock_lifetime'] : 60
);
foreach ($regions_config as $region_name => $region_config) {
if (isset($region_config['lifetime']))
$regions_configuration->setLifetime($region_name, $region_config['lifetime']);
if (isset($region_config['lock_lifetime']))
$regions_configuration->setLockLifetime($region_name, $region_config['lock_lifetime']);
}
$cacheConfig->setRegionsConfiguration($regions_configuration);
}
// Cache logger
if (isset($second_level_cache_config['log_enabled']) && $second_level_cache_config['log_enabled']){
$logger = new StatisticsCacheLogger();
$cacheConfig->setCacheLogger($logger);
}
$factory = new DefaultCacheFactory
(
$cacheConfig->getRegionsConfiguration(),
$this->cache->driver()
);
$file_lock_region_directory = isset($second_level_cache_config['file_lock_region_directory']) ?
$second_level_cache_config['file_lock_region_directory'] :
'/tmp';
$factory->setFileLockRegionDirectory($file_lock_region_directory);
$cacheConfig->setCacheFactory
(
$factory
);
}
}

176
Libs/Utils/Doctrine/EscapingQuoteStrategy.php Normal file
View File

@ -0,0 +1,176 @@
<?php namespace Libs\Utils\Doctrine;
/**
* Copyright 2021 OpenStack Foundation
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
**/
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\ORM\Mapping\QuoteStrategy;
use Doctrine\ORM\Mapping\ClassMetadata;
/**
* A set of rules for determining the physical column, alias and table quotes and automatically escape database reserved
* keyword.
*
*/
class EscapingQuoteStrategy implements QuoteStrategy
{
/**
* {@inheritdoc}
*/
public function getColumnName($fieldName, ClassMetadata $class, AbstractPlatform $platform)
{
if (isset($class->fieldMappings[$fieldName]['quoted'])) {
return $platform->quoteIdentifier($class->fieldMappings[$fieldName]['columnName']);
}
$reservedKeyList = $platform->getReservedKeywordsList();
if ($reservedKeyList->isKeyword($fieldName)) {
return $platform->quoteIdentifier($class->fieldMappings[$fieldName]['columnName']);
}
return $class->fieldMappings[$fieldName]['columnName'];
}
/**
* {@inheritdoc}
*/
public function getTableName(ClassMetadata $class, AbstractPlatform $platform)
{
if (isset($class->table['quoted'])) {
return $platform->quoteIdentifier($class->table['name']);
}
$reservedKeyList = $platform->getReservedKeywordsList();
if ($reservedKeyList->isKeyword($class->table['name'])) {
return $platform->quoteIdentifier($class->table['name']);
}
return $class->table['name'];
}
/**
* {@inheritdoc}
*/
public function getSequenceName(array $definition, ClassMetadata $class, AbstractPlatform $platform)
{
if (isset($definition['quoted'])) {
return $platform->quoteIdentifier($class->table['name']);
}
$reservedKeyList = $platform->getReservedKeywordsList();
if ($reservedKeyList->isKeyword($definition['sequenceName'])) {
return $platform->quoteIdentifier($definition['sequenceName']);
}
return $definition['sequenceName'];
}
/**
* {@inheritdoc}
*/
public function getJoinColumnName(array $joinColumn, ClassMetadata $class, AbstractPlatform $platform)
{
if (isset($joinColumn['quoted'])) {
return $platform->quoteIdentifier($joinColumn['name']);
}
$reservedKeyList = $platform->getReservedKeywordsList();
if ($reservedKeyList->isKeyword($joinColumn['name'])) {
return $platform->quoteIdentifier($joinColumn['name']);
}
return $joinColumn['name'];
}
/**
* {@inheritdoc}
*/
public function getReferencedJoinColumnName(array $joinColumn, ClassMetadata $class, AbstractPlatform $platform)
{
if (isset($joinColumn['quoted'])) {
return $platform->quoteIdentifier($joinColumn['referencedColumnName']);
}
$reservedKeyList = $platform->getReservedKeywordsList();
if ($reservedKeyList->isKeyword($joinColumn['referencedColumnName'])) {
return $platform->quoteIdentifier($joinColumn['referencedColumnName']);
}
return $joinColumn['referencedColumnName'];
}
/**
* {@inheritdoc}
*/
public function getJoinTableName(array $association, ClassMetadata $class, AbstractPlatform $platform)
{
if (isset($association['joinTable']['quoted'])) {
return $platform->quoteIdentifier($association['joinTable']['name']);
}
$reservedKeyList = $platform->getReservedKeywordsList();
if ($reservedKeyList->isKeyword($association['joinTable']['name'])) {
return $platform->quoteIdentifier($association['joinTable']['name']);
}
return $association['joinTable']['name'];
}
/**
* {@inheritdoc}
*/
public function getIdentifierColumnNames(ClassMetadata $class, AbstractPlatform $platform)
{
$quotedColumnNames = array();
foreach ($class->identifier as $fieldName) {
if (isset($class->fieldMappings[$fieldName])) {
$quotedColumnNames[] = $this->getColumnName($fieldName, $class, $platform);
continue;
}
// Association defined as Id field
$joinColumns = $class->associationMappings[$fieldName]['joinColumns'];
$assocQuotedColumnNames = array_map(
function ($joinColumn) use ($platform) {
if (isset($joinColumn['quoted'])) {
return $platform->quoteIdentifier($joinColumn['name']);
}
$reservedKeyList = $platform->getReservedKeywordsList();
if ($reservedKeyList->isKeyword($joinColumn['name'])) {
return $platform->quoteIdentifier($joinColumn['name']);
}
return $joinColumn['name'];
},
$joinColumns
);
$quotedColumnNames = array_merge($quotedColumnNames, $assocQuotedColumnNames);
}
return $quotedColumnNames;
}
/**
* {@inheritdoc}
*/
public function getColumnAlias($columnName, $counter, AbstractPlatform $platform, ClassMetadata $class = null)
{
// 1 ) Concatenate column name and counter
// 2 ) Trim the column alias to the maximum identifier length of the platform.
// If the alias is to long, characters are cut off from the beginning.
// 3 ) Strip non alphanumeric characters
// 4 ) Prefix with "_" if the result its numeric
$columnName = $columnName.'_'.$counter;
$columnName = substr($columnName, -$platform->getMaxIdentifierLength());
$columnName = preg_replace('/[^A-Za-z0-9_]/', '', $columnName);
$columnName = is_numeric($columnName) ? '_'.$columnName : $columnName;
return $platform->getSQLResultCasing($columnName);
}
}

2
Libs/Utils/JsonUtils.php
View File

@ -38,7 +38,7 @@ abstract class JsonUtils
*/
public static function toObfuscatedEmail($value){
$em = explode("@", $value);
$name = implode(array_slice($em, 0, count($em) - 1), '@');
$name = implode( '@', array_slice($em, 0, count($em) - 1));
$len = floor(mb_strlen($name) / 2);
$obfuscated_email = mb_substr($name, 0, $len) . str_repeat('*', $len) . "@" . end($em);
return $obfuscated_email;

84
app/Console/Commands/AdminActionsCalendarSyncProcessingCommand.php
View File

@ -1,84 +0,0 @@
<?php namespace App\Console\Commands;
/**
* Copyright 2017 OpenStack Foundation
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
**/
use Illuminate\Console\Command;
use App\Services\Model\IAdminActionsCalendarSyncProcessingService;
use Illuminate\Support\Facades\Config;
/**
* Class AdminActionsCalendarSyncProcessingCommand
* @package App\Console\Commands
*/
final class AdminActionsCalendarSyncProcessingCommand extends Command
{
/**
* @var IAdminActionsCalendarSyncProcessingService
*/
private $service;
/**
* MemberActionsCalendarSyncProcessingCommand constructor.
* @param IAdminActionsCalendarSyncProcessingService $service
*/
public function __construct(IAdminActionsCalendarSyncProcessingService $service)
{
parent::__construct();
$this->service = $service;
}
/**
* The console command name.
*
* @var string
*/
protected $name = 'summit:admin-schedule-action-process';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Process Admin External Schedule Sync Actions';
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'summit:admin-schedule-action-process {batch_size?}';
public function handle()
{
$enabled = boolval(Config::get("cal_sync.enable_cal_sync", true));
if(!$enabled){
$this->info("task is not enabled!");
return false;
}
$batch_size = $this->argument('batch_size');
if(empty($batch_size))
$batch_size = PHP_INT_MAX;
$start = time();
$this->info(sprintf("processing batch size of %s", $batch_size));
$res = $this->service->processActions($batch_size);
$end = time();
$delta = $end - $start;
$this->info(sprintf("execution call %s seconds - processed entries %s", $delta, $res));
}
}

91
app/Console/Commands/MemberActionsCalendarSyncProcessingCommand.php
View File

@ -1,91 +0,0 @@
<?php namespace App\Console\Commands;
/**
* Copyright 2017 OpenStack Foundation
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
**/
use Illuminate\Console\Command;
use App\Services\Model\IMemberActionsCalendarSyncProcessingService;
use Illuminate\Support\Facades\Config;
use models\summit\CalendarSync\CalendarSyncInfo;
use Illuminate\Support\Facades\Log;
/**
* Class MemberActionsCalendarSyncProcessingCommand
* @package App\Console\Commands
*/
final class MemberActionsCalendarSyncProcessingCommand extends Command
{
/**
* @var IMemberActionsCalendarSyncProcessingService
*/
private $service;
/**
* MemberActionsCalendarSyncProcessingCommand constructor.
* @param IMemberActionsCalendarSyncProcessingService $service
*/
public function __construct(IMemberActionsCalendarSyncProcessingService $service)
{
parent::__construct();
$this->service = $service;
}
/**
* The console command name.
*
* @var string
*/
protected $name = 'summit:member-schedule-action-process';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Process Member External Schedule Sync Actions';
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'summit:member-schedule-action-process {provider} {batch_size?}';
public function handle()
{
$enabled = boolval(Config::get("cal_sync.enable_cal_sync", true));
if(!$enabled){
$this->info("task is not enabled!");
return false;
}
$batch_size = $this->argument('batch_size');
$provider = $this->argument('provider');
if(!CalendarSyncInfo::isValidProvider($provider)){
$this->error("provider param is not valid , valid values are [Google, Outlook, iCloud]");
log::error("provider param is not valid , valid values are [Google, Outlook, iCloud]");
return false;
}
if(empty($batch_size))
$batch_size = 1000;
$start = time();
$this->info(sprintf("processing provider %s - batch size of %s", $provider, $batch_size));
log::info(sprintf("processing provider %s - batch size of %s", $provider, $batch_size));
$res = $this->service->processActions($provider, $batch_size);
$end = time();
$delta = $end - $start;
$this->info(sprintf("execution call %s seconds - processed entries %s", $delta, $res));
log::info(sprintf("execution call %s seconds - processed entries %s", $delta, $res));
}
}

4
app/Console/Commands/SummitEmailFlowEventSeederCommand.php
View File

@ -13,6 +13,8 @@
**/
use Illuminate\Console\Command;
use Illuminate\Support\Facades\Log;
use Database\Seeders\SummitEmailFlowEventSeeder;
use Exception;
/**
* Class SummitEmailFlowEventSeederCommand
* @package App\Console\Commands
@ -51,7 +53,7 @@ class SummitEmailFlowEventSeederCommand extends Command
try {
$start = time();
\SummitEmailFlowEventSeeder::seed();
SummitEmailFlowEventSeeder::seed();
$end = time();
$delta = $end - $start;
$this->info(sprintf("execution call %s seconds", $delta));

3
app/Console/Commands/SummitEmailFlowTypeSeederCommand.php
View File

@ -13,6 +13,7 @@
**/
use Illuminate\Console\Command;
use Illuminate\Support\Facades\Log;
use Database\Seeders\SummitEmailFlowTypeSeeder;
use Exception;
/**
* Class SummitEmailFlowTypeSeederCommand
@ -52,7 +53,7 @@ class SummitEmailFlowTypeSeederCommand extends Command
try {
$start = time();
\SummitEmailFlowTypeSeeder::seed();
SummitEmailFlowTypeSeeder::seed();
$end = time();
$delta = $end - $start;
$this->info(sprintf("execution call %s seconds", $delta));

7
app/Console/Commands/SummitForwardXDays.php
View File

@ -22,11 +22,6 @@ use Exception;
*/
class SummitForwardXDays extends Command
{
/**
* @var ISummitService
*/
private $service;
/**
* The console command name.
@ -80,7 +75,7 @@ class SummitForwardXDays extends Command
Log::debug(sprintf("SummitForwardXDays::handle tenant %s current_tenant %s", $tenant, $current_tenant));
if($tenant != $current_tenant){
if(strtoupper($tenant) != strtoupper($current_tenant)){
Log::warning(sprintf("SummitForwardXDays::handle exiting bc tenants are not the same"));
return;
}

14
app/Console/Kernel.php
View File

@ -31,8 +31,6 @@ class Kernel extends ConsoleKernel
*/
protected $commands = [
\App\Console\Commands\SummitJsonGenerator::class,
\App\Console\Commands\MemberActionsCalendarSyncProcessingCommand::class,
\App\Console\Commands\AdminActionsCalendarSyncProcessingCommand::class,
\App\Console\Commands\ChatTeamMessagesSender::class,
\App\Console\Commands\SummitListJsonGenerator::class,
\App\Console\Commands\PromoCodesRedeemProcessor::class,
@ -71,18 +69,6 @@ class Kernel extends ConsoleKernel
// list of available summits
$schedule->command('summit-list:json-generator')->everyFiveMinutes()->withoutOverlapping()->onOneServer();
// Calendar Sync Jobs
// Admin Actions
//$schedule->command('summit:admin-schedule-action-process')->withoutOverlapping();
// Member Actions
// Google Calendar
//$schedule->command('summit:member-schedule-action-process', [CalendarSyncInfo::ProviderGoogle, 1000])->withoutOverlapping();
// Outlook
//$schedule->command('summit:member-schedule-action-process', [CalendarSyncInfo::ProviderOutlook, 1000])->withoutOverlapping();
// iCloud
//$schedule->command('summit:member-schedule-action-process', [CalendarSyncInfo::ProvideriCloud, 1000])->withoutOverlapping();
// redeem code processor
//$schedule->command('summit:promo-codes-redeem-processor', [end($summit_ids)])->daily()->withoutOverlapping();

11
app/Exceptions/Handler.php
View File

@ -11,13 +11,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
**/
use Exception;
use Throwable;
use Illuminate\Validation\ValidationException;
use Illuminate\Auth\Access\AuthorizationException;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Predis\Connection\ConnectionException as RedisConnectionException;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
/**
* Class Handler
* @package App\Exceptions
@ -42,10 +43,10 @@ class Handler extends ExceptionHandler
*
* This is a great spot to send exceptions to Sentry, Bugsnag, etc.
*
* @param \Exception $e
* @param Throwable $e
* @return void
*/
public function report(Exception $e)
public function report(Throwable $e)
{
parent::report($e);
}
@ -54,10 +55,10 @@ class Handler extends ExceptionHandler
* Render an exception into an HTTP response.
*
* @param \Illuminate\Http\Request $request
* @param \Exception $e
* @param \Throwable $e
* @return \Illuminate\Http\Response
*/
public function render($request, Exception $e)
public function render($request, Throwable $e)
{
if (config('app.debug')) {
return parent::render($request, $e);

4
app/Http/Controllers/Apis/CountriesApiController.php
View File

@ -12,11 +12,11 @@
* limitations under the License.
**/
use App\Models\Foundation\Main\CountryCodes;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log;
use models\exceptions\EntityNotFoundException;
use models\exceptions\ValidationException;
use utils\PagingResponse;
use Illuminate\Support\Facades\Request;
/**
* Class CountriesApiController
* @package App\Http\Controllers
@ -45,7 +45,7 @@ final class CountriesApiController extends JsonController
$countries
);
return $this->ok($response->toArray($expand = Input::get('expand','')));
return $this->ok($response->toArray($expand = Request::input('expand','')));
}
catch (ValidationException $ex1) {
Log::warning($ex1);

4
app/Http/Controllers/Apis/LanguagesApiController.php
View File

@ -12,11 +12,11 @@
* limitations under the License.
**/
use App\Models\Foundation\Main\Repositories\ILanguageRepository;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log;
use models\exceptions\EntityNotFoundException;
use models\exceptions\ValidationException;
use utils\PagingResponse;
use Illuminate\Support\Facades\Request;
/**
* Class LanguagesApiController
* @package App\Http\Controllers
@ -52,7 +52,7 @@ final class LanguagesApiController extends JsonController
$languages
);
return $this->ok($response->toArray($expand = Input::get('expand','')));
return $this->ok($response->toArray($expand = Request::input('expand','')));
}
catch (ValidationException $ex1) {
Log::warning($ex1);

17
app/Http/Controllers/Apis/Marketplace/AbstractCompanyServiceApiController.php
View File

@ -14,7 +14,6 @@
use models\utils\IBaseRepository;
use models\exceptions\EntityNotFoundException;
use models\exceptions\ValidationException;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Validator;
use utils\Filter;
use utils\FilterParser;
@ -46,7 +45,7 @@ abstract class AbstractCompanyServiceApiController extends JsonController
* @return mixed
*/
public function getAll(){
$values = Input::all();
$values = Request::all();
$rules = array
(
@ -67,15 +66,15 @@ abstract class AbstractCompanyServiceApiController extends JsonController
$page = 1;
$per_page = 5;
if (Input::has('page')) {
$page = intval(Input::get('page'));
$per_page = intval(Input::get('per_page'));
if (Request::has('page')) {
$page = intval(Request::input('page'));
$per_page = intval(Request::input('per_page'));
}
$filter = null;
if (Input::has('filter')) {
$filter = FilterParser::parse(Input::get('filter'), array
if (Request::has('filter')) {
$filter = FilterParser::parse(Request::input('filter'), array
(
'name' => ['=@', '=='],
'company' => ['=@', '=='],
@ -84,9 +83,9 @@ abstract class AbstractCompanyServiceApiController extends JsonController
$order = null;
if (Input::has('order'))
if (Request::has('order'))
{
$order = OrderParser::parse(Input::get('order'), array
$order = OrderParser::parse(Request::input('order'), array
(
'name',
'company',

10
app/Http/Controllers/Apis/Marketplace/AppliancesApiController.php
View File

@ -12,16 +12,6 @@
* limitations under the License.
**/
use App\Models\Foundation\Marketplace\IApplianceRepository;
use models\exceptions\EntityNotFoundException;
use models\exceptions\ValidationException;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Validator;
use utils\Filter;
use utils\FilterParser;
use utils\OrderParser;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Log;
use utils\PagingInfo;
/**
* Class AppliancesApiController
* @package App\Http\Controllers

12
app/Http/Controllers/Apis/Marketplace/DistributionsApiController.php
View File

@ -11,19 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
**/
use App\Http\Controllers\JsonController;
use App\Models\Foundation\Marketplace\IDistributionRepository;
use models\exceptions\EntityNotFoundException;
use models\exceptions\ValidationException;
use Exception;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Validator;
use utils\FilterParser;
use Illuminate\Support\Facades\Input;
use utils\Filter;
use utils\PagingInfo;
use Illuminate\Support\Facades\Request;
use utils\OrderParser;
/**
* Class DistributionsApiController
* @package App\Http\Controllers\Apis\Marketplace

17
app/Http/Controllers/Apis/Protected/Main/OAuth2GroupsApiController.php
View File

@ -22,7 +22,6 @@ use Illuminate\Support\Facades\Log;
use utils\PagingInfo;
use models\exceptions\EntityNotFoundException;
use models\exceptions\ValidationException;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Validator;
/**
* Class OAuth2GroupsApiController
@ -47,7 +46,7 @@ final class OAuth2GroupsApiController extends OAuth2ProtectedController
public function getAll(){
$values = Input::all();
$values = Request::all();
$rules = array
(
@ -68,15 +67,15 @@ final class OAuth2GroupsApiController extends OAuth2ProtectedController
$page = 1;
$per_page = 5;
if (Input::has('page')) {
$page = intval(Input::get('page'));
$per_page = intval(Input::get('per_page'));
if (Request::has('page')) {
$page = intval(Request::input('page'));
$per_page = intval(Request::input('per_page'));
}
$filter = null;
if (Input::has('filter')) {
$filter = FilterParser::parse(Input::get('filter'), array
if (Request::has('filter')) {
$filter = FilterParser::parse(Request::input('filter'), array
(
'code' => ['=@', '=='],
'title' => ['=@', '=='],
@ -85,9 +84,9 @@ final class OAuth2GroupsApiController extends OAuth2ProtectedController
$order = null;
if (Input::has('order'))
if (Request::has('order'))
{
$order = OrderParser::parse(Input::get('order'), array
$order = OrderParser::parse(Request::input('order'), array
(
'code',
'title',

27
app/Http/Controllers/Apis/Protected/Main/OAuth2MembersApiController.php
View File

@ -17,7 +17,6 @@ use models\exceptions\EntityNotFoundException;
use models\exceptions\ValidationException;
use models\main\IMemberRepository;
use models\oauth2\IResourceServerContext;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Validator;
use ModelSerializers\SerializerRegistry;
use utils\Filter;
@ -63,7 +62,7 @@ final class OAuth2MembersApiController extends OAuth2ProtectedController
*/
public function getAll(){
$values = Input::all();
$values = Request::all();
$rules = [
'page' => 'integer|min:1',
@ -83,15 +82,15 @@ final class OAuth2MembersApiController extends OAuth2ProtectedController
$page = 1;
$per_page = PagingConstants::DefaultPageSize;;
if (Input::has('page')) {
$page = intval(Input::get('page'));
$per_page = intval(Input::get('per_page'));
if (Request::has('page')) {
$page = intval(Request::input('page'));
$per_page = intval(Request::input('per_page'));
}
$filter = null;
if (Input::has('filter')) {
$filter = FilterParser::parse(Input::get('filter'), [
if (Request::has('filter')) {
$filter = FilterParser::parse(Request::input('filter'), [
'irc' => ['=@', '=='],
'twitter' => ['=@', '=='],
@ -129,9 +128,9 @@ final class OAuth2MembersApiController extends OAuth2ProtectedController
$order = null;
if (Input::has('order'))
if (Request::has('order'))
{
$order = OrderParser::parse(Input::get('order'), [
$order = OrderParser::parse(Request::input('order'), [
'first_name',
'last_name',
'id',
@ -234,7 +233,7 @@ final class OAuth2MembersApiController extends OAuth2ProtectedController
$affiliations
);
return $this->ok($response->toArray($expand = Input::get('expand','')));
return $this->ok($response->toArray($expand = Request::input('expand','')));
}
catch (EntityNotFoundException $ex1) {
@ -269,7 +268,7 @@ final class OAuth2MembersApiController extends OAuth2ProtectedController
public function addAffiliation($member_id){
try {
if(!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$member = (strtolower($member_id) == 'me') ?
$this->resource_server_context->getCurrentUser() :
@ -302,7 +301,7 @@ final class OAuth2MembersApiController extends OAuth2ProtectedController
return $this->created(SerializerRegistry::getInstance()->getSerializer($affiliation)->serialize
(
Input::get('expand','')
Request::input('expand','')
));
}
catch (ValidationException $ex1) {
@ -337,7 +336,7 @@ final class OAuth2MembersApiController extends OAuth2ProtectedController
public function updateAffiliation($member_id, $affiliation_id){
try {
if(!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$member = (strtolower($member_id) == 'me') ?
$this->resource_server_context->getCurrentUser() :
@ -369,7 +368,7 @@ final class OAuth2MembersApiController extends OAuth2ProtectedController
$affiliation = $this->member_service->updateAffiliation($member, $affiliation_id, $data->all());
return $this->updated(SerializerRegistry::getInstance()->getSerializer($affiliation)->serialize(
Input::get('expand','')
Request::input('expand','')
));
}
catch (ValidationException $ex1) {

19
app/Http/Controllers/Apis/Protected/Main/OAuth2OrganizationsApiController.php
View File

@ -24,7 +24,6 @@ use Illuminate\Support\Facades\Log;
use utils\PagingInfo;
use models\exceptions\EntityNotFoundException;
use models\exceptions\ValidationException;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Validator;
/**
* Class OAuth2OrganizationsApiController
@ -57,7 +56,7 @@ final class OAuth2OrganizationsApiController extends OAuth2ProtectedController
public function getAll(){
$values = Input::all();
$values = Request::all();
$rules = [
@ -78,15 +77,15 @@ final class OAuth2OrganizationsApiController extends OAuth2ProtectedController
$page = 1;
$per_page = 5;
if (Input::has('page')) {
$page = intval(Input::get('page'));
$per_page = intval(Input::get('per_page'));
if (Request::has('page')) {
$page = intval(Request::input('page'));
$per_page = intval(Request::input('per_page'));
}
$filter = null;
if (Input::has('filter')) {
$filter = FilterParser::parse(Input::get('filter'), [
if (Request::has('filter')) {
$filter = FilterParser::parse(Request::input('filter'), [
'name' => ['=@', '=='],
]);
@ -94,9 +93,9 @@ final class OAuth2OrganizationsApiController extends OAuth2ProtectedController
$order = null;
if (Input::has('order'))
if (Request::has('order'))
{
$order = OrderParser::parse(Input::get('order'), [
$order = OrderParser::parse(Request::input('order'), [
'name',
'id',
@ -145,7 +144,7 @@ final class OAuth2OrganizationsApiController extends OAuth2ProtectedController
if(!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$rules = [
'name' => 'required|string|max:255',

21
app/Http/Controllers/Apis/Protected/Main/OAuth2TagsApiController.php
View File

@ -13,7 +13,6 @@
**/
use models\main\ITagRepository;
use models\oauth2\IResourceServerContext;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Validator;
use ModelSerializers\SerializerRegistry;
use utils\Filter;
@ -57,7 +56,7 @@ final class OAuth2TagsApiController extends OAuth2ProtectedController
public function getAll(){
$values = Input::all();
$values = Request::all();
$rules = [
'page' => 'integer|min:1',
@ -77,15 +76,15 @@ final class OAuth2TagsApiController extends OAuth2ProtectedController
$page = 1;
$per_page = 5;
if (Input::has('page')) {
$page = intval(Input::get('page'));
$per_page = intval(Input::get('per_page'));
if (Request::has('page')) {
$page = intval(Request::input('page'));
$per_page = intval(Request::input('per_page'));
}
$filter = null;
if (Input::has('filter')) {
$filter = FilterParser::parse(Input::get('filter'), [
if (Request::has('filter')) {
$filter = FilterParser::parse(Request::input('filter'), [
'tag' => ['=@', '=='],
]);
@ -93,9 +92,9 @@ final class OAuth2TagsApiController extends OAuth2ProtectedController
$order = null;
if (Input::has('order'))
if (Request::has('order'))
{
$order = OrderParser::parse(Input::get('order'), [
$order = OrderParser::parse(Request::input('order'), [
'tag',
'id',
]);
@ -141,7 +140,7 @@ final class OAuth2TagsApiController extends OAuth2ProtectedController
public function addTag(){
try {
if(!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$rules = [
'tag' => 'required|string',
@ -163,7 +162,7 @@ final class OAuth2TagsApiController extends OAuth2ProtectedController
return $this->created(SerializerRegistry::getInstance()->getSerializer($tag)->serialize
(
Input::get('expand','')
Request::input('expand','')
));
}
catch (ValidationException $ex1) {

8
app/Http/Controllers/Apis/Protected/Main/OAuth2TeamInvitationsApiController.php
View File

@ -19,7 +19,7 @@ use models\oauth2\IResourceServerContext;
use ModelSerializers\SerializerRegistry;
use services\model\IChatTeamService;
use utils\PagingResponse;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Request;
/**
* Class OAuth2TeamInvitationsApiController
* @package App\Http\Controllers
@ -69,7 +69,7 @@ final class OAuth2TeamInvitationsApiController extends OAuth2ProtectedController
$invitations
);
return $this->ok($response->toArray($expand = Input::get('expand','')));
return $this->ok($response->toArray($expand = Request::input('expand','')));
}
catch (ValidationException $ex1) {
Log::warning($ex1);
@ -106,7 +106,7 @@ final class OAuth2TeamInvitationsApiController extends OAuth2ProtectedController
$invitations
);
return $this->ok($response->toArray($expand = Input::get('expand','')));
return $this->ok($response->toArray($expand = Request::input('expand','')));
}
catch (ValidationException $ex1) {
Log::warning($ex1);
@ -143,7 +143,7 @@ final class OAuth2TeamInvitationsApiController extends OAuth2ProtectedController
$invitations
);
return $this->ok($response->toArray($expand = Input::get('expand','')));
return $this->ok($response->toArray($expand = Request::input('expand','')));
}
catch (ValidationException $ex1) {
Log::warning($ex1);

29
app/Http/Controllers/Apis/Protected/Main/OAuth2TeamsApiController.php
View File

@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
**/
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Validator;
@ -100,7 +99,7 @@ final class OAuth2TeamsApiController extends OAuth2ProtectedController
(
$response->toArray
(
$expand = Input::get('expand',''),
$expand = Request::input('expand',''),
$fields = [],
$relations = [],
$params = [
@ -148,7 +147,7 @@ final class OAuth2TeamsApiController extends OAuth2ProtectedController
->getSerializer($team)
->serialize
(
$expand = Input::get('expand',''),
$expand = Request::input('expand',''),
$fields = [],
$relations = [],
$params = [
@ -181,7 +180,7 @@ final class OAuth2TeamsApiController extends OAuth2ProtectedController
if(!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$rules = array
(
@ -268,7 +267,7 @@ final class OAuth2TeamsApiController extends OAuth2ProtectedController
if(!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$rules = array
(
@ -323,7 +322,7 @@ final class OAuth2TeamsApiController extends OAuth2ProtectedController
*/
public function getMyTeamMessages($team_id){
$values = Input::all();
$values = Request::all();
$rules = array
(
@ -345,15 +344,15 @@ final class OAuth2TeamsApiController extends OAuth2ProtectedController
$page = 1;
$per_page = 5;
if (Input::has('page')) {
$page = intval(Input::get('page'));
$per_page = intval(Input::get('per_page'));
if (Request::has('page')) {
$page = intval(Request::input('page'));
$per_page = intval(Request::input('per_page'));
}
$filter = null;
if (Input::has('filter')) {
$filter = FilterParser::parse(Input::get('filter'), array
if (Request::has('filter')) {
$filter = FilterParser::parse(Request::input('filter'), array
(
'owner_id' => ['=='],
'sent_date' => ['>', '<', '<=', '>=', '=='],
@ -362,9 +361,9 @@ final class OAuth2TeamsApiController extends OAuth2ProtectedController
$order = null;
if (Input::has('order'))
if (Request::has('order'))
{
$order = OrderParser::parse(Input::get('order'), array
$order = OrderParser::parse(Request::input('order'), array
(
'sent_date',
'id',
@ -417,7 +416,7 @@ final class OAuth2TeamsApiController extends OAuth2ProtectedController
if(!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$rules = array
(
@ -472,7 +471,7 @@ final class OAuth2TeamsApiController extends OAuth2ProtectedController
if(!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$rules = array
(

2
app/Http/Controllers/Apis/Protected/Summit/Factories/Registration/SummitOrderExtraQuestionTypeValidationRulesFactory.php
View File

@ -26,7 +26,7 @@ extends ExtraQuestionTypeValidationRulesFactory
*/
public static function build(array $data, $update = false){
$rules = parent::build($data,$update);
$rules = parent::build($data, $update);
if($update){
return array_merge([

15
app/Http/Controllers/Apis/Protected/Summit/OAuth2PresentationApiController.php
View File

@ -26,7 +26,6 @@ use models\summit\ISummitEventRepository;
use models\summit\ISummitRepository;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log;
use Illuminate\Http\Request as LaravelRequest;
use Exception;
@ -160,7 +159,7 @@ final class OAuth2PresentationApiController extends OAuth2ProtectedController
if (!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$data = $data->all();
// Creates a Validator instance and validates the data.
@ -208,7 +207,8 @@ final class OAuth2PresentationApiController extends OAuth2ProtectedController
if (!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$data = $data->all();
// Creates a Validator instance and validates the data.
$validation = Validator::make($data, PresentationVideoValidationRulesFactory::build($data, true));
@ -283,7 +283,8 @@ final class OAuth2PresentationApiController extends OAuth2ProtectedController
$current_member = $this->resource_server_context->getCurrentUser();
if (is_null($current_member)) return $this->error403();
$data = Input::json();
$data = Request::json();
$data = $data->all();
// Creates a Validator instance and validates the data.
$validation = Validator::make($data, SummitEventValidationRulesFactory::buildForSubmission($data));
@ -333,11 +334,11 @@ final class OAuth2PresentationApiController extends OAuth2ProtectedController
$current_member = $this->resource_server_context->getCurrentUser();
if (is_null($current_member)) return $this->error403();
$data = Input::json();
$data = Request::json();
$data = $data->all();
// Creates a Validator instance and validates the data.
$validation = Validator::make($data, SummitEventValidationRulesFactory::buildForSubmission($data . true));
$validation = Validator::make($data, SummitEventValidationRulesFactory::buildForSubmission($data, true));
if ($validation->fails()) {
$ex = new ValidationException;
@ -1195,7 +1196,7 @@ final class OAuth2PresentationApiController extends OAuth2ProtectedController
$current_member = $this->resource_server_context->getCurrentUser();
if (is_null($current_member)) return $this->error403();
$data = Input::json();
$data = Request::json();
$data = $data->all();
// Creates a Validator instance and validates the data.
$validation = Validator::make($data,[

36
app/Http/Controllers/Apis/Protected/Summit/OAuth2PresentationCategoryGroupController.php
View File

@ -17,7 +17,6 @@ use App\Models\Foundation\Summit\Events\Presentations\PresentationCategoryGroupC
use App\Models\Foundation\Summit\Repositories\IPresentationCategoryGroupRepository;
use App\Services\Model\IPresentationCategoryGroupService;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Validator;
use models\exceptions\ValidationException;
@ -30,7 +29,6 @@ use utils\FilterParser;
use utils\OrderParser;
use utils\PagingInfo;
use Exception;
use utils\PagingResponse;
/**
* Class OAuth2PresentationCategoryGroupController
* @package App\Http\Controllers
@ -74,7 +72,7 @@ final class OAuth2PresentationCategoryGroupController
* @return mixed
*/
public function getAllBySummit($summit_id){
$values = Input::all();
$values = Request::all();
$rules = [
'page' => 'integer|min:1',
@ -97,15 +95,15 @@ final class OAuth2PresentationCategoryGroupController
$page = 1;
$per_page = PagingConstants::DefaultPageSize;
if (Input::has('page')) {
$page = intval(Input::get('page'));
$per_page = intval(Input::get('per_page'));
if (Request::has('page')) {
$page = intval(Request::input('page'));
$per_page = intval(Request::input('per_page'));
}
$filter = null;
if (Input::has('filter')) {
$filter = FilterParser::parse(Input::get('filter'), [
if (Request::has('filter')) {
$filter = FilterParser::parse(Request::input('filter'), [
'name' => ['=@', '=='],
'description' => ['=@', '=='],
'slug' => ['=@', '=='],
@ -143,9 +141,9 @@ final class OAuth2PresentationCategoryGroupController
$order = null;
if (Input::has('order'))
if (Request::has('order'))
{
$order = OrderParser::parse(Input::get('order'), [
$order = OrderParser::parse(Request::input('order'), [
'id',
'name',
'slug'
@ -200,15 +198,15 @@ final class OAuth2PresentationCategoryGroupController
$page = 1;
$per_page = PHP_INT_MAX;
if (Input::has('page')) {
$page = intval(Input::get('page'));
$per_page = intval(Input::get('per_page'));
if (Request::has('page')) {
$page = intval(Request::input('page'));
$per_page = intval(Request::input('per_page'));
}
$filter = null;
if (Input::has('filter')) {
$filter = FilterParser::parse(Input::get('filter'), [
if (Request::has('filter')) {
$filter = FilterParser::parse(Request::input('filter'), [
'name' => ['=@', '=='],
'description' => ['=@', '=='],
'slug' => ['=@', '=='],
@ -246,9 +244,9 @@ final class OAuth2PresentationCategoryGroupController
$order = null;
if (Input::has('order'))
if (Request::has('order'))
{
$order = OrderParser::parse(Input::get('order'), [
$order = OrderParser::parse(Request::input('order'), [
'id',
'name',
'slug'
@ -328,7 +326,7 @@ final class OAuth2PresentationCategoryGroupController
try {
if(!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$payload = $data->all();
$summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
@ -403,7 +401,7 @@ final class OAuth2PresentationCategoryGroupController
try {
if(!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$payload = $data->all();
$summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();

4
app/Http/Controllers/Apis/Protected/Summit/OAuth2SpeakerActiveInvolvementApiController.php
View File

@ -13,11 +13,11 @@
**/
use App\Models\Foundation\Summit\Repositories\ISpeakerActiveInvolvementRepository;
use models\oauth2\IResourceServerContext;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log;
use models\exceptions\EntityNotFoundException;
use models\exceptions\ValidationException;
use utils\PagingResponse;
use Illuminate\Support\Facades\Request;
/**
* Class OAuth2SpeakerActiveInvolvementApiController
* @package App\Http\Controllers
@ -55,7 +55,7 @@ final class OAuth2SpeakerActiveInvolvementApiController extends OAuth2ProtectedC
$involvements
);
return $this->ok($response->toArray($expand = Input::get('expand','')));
return $this->ok($response->toArray($expand = Request::input('expand','')));
}
catch (ValidationException $ex1) {
Log::warning($ex1);

4
app/Http/Controllers/Apis/Protected/Summit/OAuth2SpeakerOrganizationalRoleApiController.php
View File

@ -13,11 +13,11 @@
**/
use App\Models\Foundation\Summit\Repositories\ISpeakerOrganizationalRoleRepository;
use models\oauth2\IResourceServerContext;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log;
use models\exceptions\EntityNotFoundException;
use models\exceptions\ValidationException;
use utils\PagingResponse;
use Illuminate\Support\Facades\Request;
/**
* Class OAuth2SpeakerOrganizationalRoleApiController
* @package App\Http\Controllers
@ -56,7 +56,7 @@ final class OAuth2SpeakerOrganizationalRoleApiController extends OAuth2Protected
$roles
);
return $this->ok($response->toArray($expand = Input::get('expand', '')));
return $this->ok($response->toArray($expand = Request::input('expand', '')));
} catch (ValidationException $ex1) {
Log::warning($ex1);
return $this->error412(array($ex1->getMessage()));

5
app/Http/Controllers/Apis/Protected/Summit/OAuth2SponsorshipTypeApiController.php
View File

@ -14,7 +14,6 @@
use App\Models\Foundation\Summit\Repositories\ISponsorshipTypeRepository;
use App\Services\Model\ISponsorshipTypeService;
use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Request;
use models\exceptions\EntityNotFoundException;
@ -111,7 +110,7 @@ final class OAuth2SponsorshipTypeApiController extends OAuth2ProtectedController
{
try {
if (!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$payload = $data->all();
// Creates a Validator instance and validates the data.
@ -172,7 +171,7 @@ final class OAuth2SponsorshipTypeApiController extends OAuth2ProtectedController
{
try {
if (!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$payload = $data->all();
// Creates a Validator instance and validates the data.

6
app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitApiController.php
View File

@ -15,13 +15,11 @@ use App\Http\Exceptions\HTTP403ForbiddenException;
use App\Models\Foundation\Main\IGroup;
use App\Models\Foundation\Summit\Registration\IBuildDefaultPaymentGatewayProfileStrategy;
use Exception;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Validator;
use models\exceptions\EntityNotFoundException;
use models\exceptions\ValidationException;
use models\main\SummitAdministratorPermissionGroup;
use models\oauth2\IResourceServerContext;
use models\summit\ConfirmationExternalOrderRequest;
use models\summit\IEventFeedbackRepository;
@ -402,7 +400,7 @@ final class OAuth2SummitApiController extends OAuth2ProtectedController
try {
if (!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$rules = SummitValidationRulesFactory::build($payload);
// Creates a Validator instance and validates the data.
@ -444,7 +442,7 @@ final class OAuth2SummitApiController extends OAuth2ProtectedController
try {
if (!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$rules = SummitValidationRulesFactory::build($payload, true);
// Creates a Validator instance and validates the data.

15
app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitAttendeesApiController.php
View File

@ -37,7 +37,6 @@ use ModelSerializers\SerializerRegistry;
use services\model\ISummitService;
use utils\Filter;
use utils\FilterElement;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Validator;
use utils\FilterParser;
@ -507,7 +506,7 @@ final class OAuth2SummitAttendeesApiController extends OAuth2ProtectedController
{
try {
if (!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
@ -593,7 +592,7 @@ final class OAuth2SummitAttendeesApiController extends OAuth2ProtectedController
{
try {
if (!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
@ -650,7 +649,7 @@ final class OAuth2SummitAttendeesApiController extends OAuth2ProtectedController
{
try {
if (!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
@ -835,7 +834,7 @@ final class OAuth2SummitAttendeesApiController extends OAuth2ProtectedController
try {
if (!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$summit = SummitFinderStrategyFactory::build($this->getSummitRepository(), $this->getResourceServerContext())->find($summit_id);
if (is_null($summit)) return $this->error404();
@ -862,8 +861,8 @@ final class OAuth2SummitAttendeesApiController extends OAuth2ProtectedController
$filter = null;
if (Input::has('filter')) {
$filter = FilterParser::parse(Input::get('filter'), [
if (Request::has('filter')) {
$filter = FilterParser::parse(Request::input('filter'), [
'first_name' => ['=@', '=='],
'last_name' => ['=@', '=='],
'full_name' => ['=@', '=='],
@ -901,7 +900,7 @@ final class OAuth2SummitAttendeesApiController extends OAuth2ProtectedController
'has_tickets'=> 'sometimes|required|string|in:true,false',
]);
$this->attendee_service->triggerSend($summit, $payload, Input::get('filter'));
$this->attendee_service->triggerSend($summit, $payload, Request::input('filter'));
return $this->ok();

3
app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitBadgeScanApiController.php
View File

@ -17,7 +17,6 @@ use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Request;
use models\exceptions\EntityNotFoundException;
use models\summit\ISponsorUserInfoGrantRepository;
use Illuminate\Support\Facades\Input;
use models\exceptions\ValidationException;
use models\oauth2\IResourceServerContext;
use App\Services\Model\ISponsorUserInfoGrantService;
@ -358,7 +357,7 @@ final class OAuth2SummitBadgeScanApiController
'attendee_company'
];
$columns_param = Input::get("columns", "");
$columns_param = Request::input("columns", "");
$columns = [];
if(!empty($columns_param))
$columns = explode(',', $columns_param);

42
app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitBookableRoomsAttributeTypeApiController.php
View File

@ -14,8 +14,6 @@
use App\Http\Utils\PagingConstants;
use App\Models\Foundation\Summit\Repositories\ISummitBookableVenueRoomAttributeTypeRepository;
use App\Models\Foundation\Summit\Repositories\ISummitBookableVenueRoomAttributeValueRepository;
use App\Services\Model\ILocationService;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Validator;
@ -86,7 +84,7 @@ final class OAuth2SummitBookableRoomsAttributeTypeApiController extends OAuth2Pr
* @return \Illuminate\Http\JsonResponse|mixed
*/
public function getAllBookableRoomAttributeTypes($summit_id){
$values = Input::all();
$values = Request::all();
$rules = [
'page' => 'integer|min:1',
@ -109,15 +107,15 @@ final class OAuth2SummitBookableRoomsAttributeTypeApiController extends OAuth2Pr
$page = 1;
$per_page = PagingConstants::DefaultPageSize;
if (Input::has('page')) {
$page = intval(Input::get('page'));
$per_page = intval(Input::get('per_page'));
if (Request::has('page')) {
$page = intval(Request::input('page'));
$per_page = intval(Request::input('per_page'));
}
$filter = null;
if (Input::has('filter')) {
$filter = FilterParser::parse(Input::get('filter'), [
if (Request::has('filter')) {
$filter = FilterParser::parse(Request::input('filter'), [
'type' => ['==', '=@'],
'summit_id' => ['=='],
]);
@ -131,9 +129,9 @@ final class OAuth2SummitBookableRoomsAttributeTypeApiController extends OAuth2Pr
$order = null;
if (Input::has('order'))
if (Request::has('order'))
{
$order = OrderParser::parse(Input::get('order'), [
$order = OrderParser::parse(Request::input('order'), [
'id',
'type',
]);
@ -182,7 +180,7 @@ final class OAuth2SummitBookableRoomsAttributeTypeApiController extends OAuth2Pr
public function addBookableRoomAttributeType($summit_id){
try {
if(!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
@ -259,7 +257,7 @@ final class OAuth2SummitBookableRoomsAttributeTypeApiController extends OAuth2Pr
public function updateBookableRoomAttributeType($summit_id, $type_id){
try {
if(!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
@ -335,7 +333,7 @@ final class OAuth2SummitBookableRoomsAttributeTypeApiController extends OAuth2Pr
* @return \Illuminate\Http\JsonResponse|mixed
*/
public function getAllBookableRoomAttributeValues($summit_id, $type_id){
$values = Input::all();
$values = Request::all();
$rules = [
'page' => 'integer|min:1',
@ -361,15 +359,15 @@ final class OAuth2SummitBookableRoomsAttributeTypeApiController extends OAuth2Pr
$page = 1;
$per_page = PagingConstants::DefaultPageSize;
if (Input::has('page')) {
$page = intval(Input::get('page'));
$per_page = intval(Input::get('per_page'));
if (Request::has('page')) {
$page = intval(Request::input('page'));
$per_page = intval(Request::input('per_page'));
}
$filter = null;
if (Input::has('filter')) {
$filter = FilterParser::parse(Input::get('filter'), [
if (Request::has('filter')) {
$filter = FilterParser::parse(Request::input('filter'), [
'value' => ['==', '=@'],
'summit_id' => ['=='],
'type_id' => ['=='],
@ -385,9 +383,9 @@ final class OAuth2SummitBookableRoomsAttributeTypeApiController extends OAuth2Pr
$order = null;
if (Input::has('order'))
if (Request::has('order'))
{
$order = OrderParser::parse(Input::get('order'), [
$order = OrderParser::parse(Request::input('order'), [
'id',
'value',
]);
@ -473,7 +471,7 @@ final class OAuth2SummitBookableRoomsAttributeTypeApiController extends OAuth2Pr
public function addBookableRoomAttributeValue($summit_id, $type_id){
try {
if(!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
@ -521,7 +519,7 @@ final class OAuth2SummitBookableRoomsAttributeTypeApiController extends OAuth2Pr
public function updateBookableRoomAttributeValue($summit_id, $type_id, $value_id){
try {
if(!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();

29
app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitEventsApiController.php
View File

@ -16,7 +16,6 @@ use App\Http\Utils\EpochCellFormatter;
use App\Http\Utils\MultipartFormDataCleaner;
use Exception;
use Illuminate\Http\Request as LaravelRequest;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Validator;
@ -436,7 +435,7 @@ final class OAuth2SummitEventsApiController extends OAuth2ProtectedController
$summit = SummitFinderStrategyFactory::build($this->repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
if(!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$current_member = $this->resource_server_context->getCurrentUser();
$payload = $data->all();
@ -490,7 +489,7 @@ final class OAuth2SummitEventsApiController extends OAuth2ProtectedController
if (is_null($summit)) return $this->error404();
if(!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$current_member = $this->resource_server_context->getCurrentUser();
if (is_null($current_member)) return $this->error403();
@ -547,7 +546,7 @@ final class OAuth2SummitEventsApiController extends OAuth2ProtectedController
if (is_null($summit)) return $this->error404();
if(!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$rules = array
(
@ -668,7 +667,7 @@ final class OAuth2SummitEventsApiController extends OAuth2ProtectedController
$summit = SummitFinderStrategyFactory::build($this->repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
$values = Input::all();
$values = Request::all();
$rules = array
(
@ -695,16 +694,16 @@ final class OAuth2SummitEventsApiController extends OAuth2ProtectedController
$page = 1;
$per_page = 5;
if (Input::has('page'))
if (Request::has('page'))
{
$page = intval(Input::get('page'));
$per_page = intval(Input::get('per_page'));
$page = intval(Request::input('page'));
$per_page = intval(Request::input('per_page'));
}
$order = null;
if (Input::has('order'))
if (Request::has('order'))
{
$order = OrderParser::parse(Input::get('order'), array
$order = OrderParser::parse(Request::input('order'), array
(
'created_date',
'owner_id',
@ -1027,8 +1026,8 @@ final class OAuth2SummitEventsApiController extends OAuth2ProtectedController
$summit = SummitFinderStrategyFactory::build($this->repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
$filter = null;
if (Input::has('filter')) {
$filter = FilterParser::parse(Input::get('filter'), [
if (Request::has('filter')) {
$filter = FilterParser::parse(Request::input('filter'), [
'location_id' => ['=='],
'start_date' => ['>='],
'end_date' => ['<='],
@ -1088,7 +1087,7 @@ final class OAuth2SummitEventsApiController extends OAuth2ProtectedController
if(!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$rules = [
'events' => 'required|int_array',
@ -1137,7 +1136,7 @@ final class OAuth2SummitEventsApiController extends OAuth2ProtectedController
if(!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$rules = [
'events' => 'required|event_dto_publish_array',
@ -1186,7 +1185,7 @@ final class OAuth2SummitEventsApiController extends OAuth2ProtectedController
if(!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$rules = [
'events' => 'required|event_dto_array',

93
app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitLocationsApiController.php
View File

@ -20,7 +20,6 @@ use App\Models\Foundation\Summit\Repositories\ISummitRoomReservationRepository;
use App\Services\Model\ILocationService;
use Exception;
use Illuminate\Http\Request as LaravelRequest;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Validator;
@ -146,7 +145,7 @@ final class OAuth2SummitLocationsApiController extends OAuth2ProtectedController
*/
public function getLocations($summit_id)
{
$values = Input::all();
$values = Request::all();
$rules = [
'page' => 'integer|min:1',
@ -169,15 +168,15 @@ final class OAuth2SummitLocationsApiController extends OAuth2ProtectedController
$page = 1;
$per_page = PagingConstants::DefaultPageSize;
if (Input::has('page')) {
$page = intval(Input::get('page'));
$per_page = intval(Input::get('per_page'));
if (Request::has('page')) {
$page = intval(Request::input('page'));
$per_page = intval(Request::input('per_page'));
}
$filter = null;
if (Input::has('filter')) {
$filter = FilterParser::parse(Input::get('filter'), [
if (Request::has('filter')) {
$filter = FilterParser::parse(Request::input('filter'), [
'class_name' => ['=='],
'name' => ['==', '=@'],
'description' => ['=@'],
@ -215,9 +214,9 @@ final class OAuth2SummitLocationsApiController extends OAuth2ProtectedController
$order = null;
if (Input::has('order'))
if (Request::has('order'))
{
$order = OrderParser::parse(Input::get('order'), [
$order = OrderParser::parse(Request::input('order'), [
'id',
'name',
'order'
@ -285,7 +284,7 @@ final class OAuth2SummitLocationsApiController extends OAuth2ProtectedController
$locations
);
return $this->ok($response->toArray($expand = Input::get('expand','')));
return $this->ok($response->toArray($expand = Request::input('expand','')));
} catch (Exception $ex) {
Log::error($ex);
@ -319,7 +318,7 @@ final class OAuth2SummitLocationsApiController extends OAuth2ProtectedController
$locations
);
return $this->ok($response->toArray($expand = Input::get('expand','')));
return $this->ok($response->toArray($expand = Request::input('expand','')));
} catch (Exception $ex) {
Log::error($ex);
@ -353,7 +352,7 @@ final class OAuth2SummitLocationsApiController extends OAuth2ProtectedController
$locations
);
return $this->ok($response->toArray($expand = Input::get('expand','')));
return $this->ok($response->toArray($expand = Request::input('expand','')));
} catch (Exception $ex) {
Log::error($ex);
@ -387,7 +386,7 @@ final class OAuth2SummitLocationsApiController extends OAuth2ProtectedController
$locations
);
return $this->ok($response->toArray($expand = Input::get('expand','')));
return $this->ok($response->toArray($expand = Request::input('expand','')));
} catch (Exception $ex) {
Log::error($ex);
@ -445,7 +444,7 @@ final class OAuth2SummitLocationsApiController extends OAuth2ProtectedController
throw new EntityNotFoundException;
}
$values = Input::all();
$values = Request::all();
$rules =
[
@ -464,15 +463,15 @@ final class OAuth2SummitLocationsApiController extends OAuth2ProtectedController
$page = 1;
$per_page = PagingConstants::DefaultPageSize;
if (Input::has('page')) {
$page = intval(Input::get('page'));
$per_page = intval(Input::get('per_page'));
if (Request::has('page')) {
$page = intval(Request::input('page'));
$per_page = intval(Request::input('per_page'));
}
$filter = null;
if (Input::has('filter')) {
$filter = FilterParser::parse(Input::get('filter'),
if (Request::has('filter')) {
$filter = FilterParser::parse(Request::input('filter'),
[
'title' => ['=@', '=='],
'start_date' => ['>', '<', '<=', '>=', '=='],
@ -486,9 +485,9 @@ final class OAuth2SummitLocationsApiController extends OAuth2ProtectedController
$order = null;
if (Input::has('order'))
if (Request::has('order'))
{
$order = OrderParser::parse(Input::get('order'),
$order = OrderParser::parse(Request::input('order'),
[
'title',
'start_date',
@ -747,7 +746,7 @@ final class OAuth2SummitLocationsApiController extends OAuth2ProtectedController
try {
if(!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$summit = SummitFinderStrategyFactory::build($this->repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
@ -791,7 +790,7 @@ final class OAuth2SummitLocationsApiController extends OAuth2ProtectedController
public function addVenue($summit_id){
try {
if(!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$summit = SummitFinderStrategyFactory::build($this->repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
$payload['class_name'] = SummitVenue::ClassName;
@ -834,7 +833,7 @@ final class OAuth2SummitLocationsApiController extends OAuth2ProtectedController
public function addExternalLocation($summit_id){
try {
if(!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$summit = SummitFinderStrategyFactory::build($this->repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
$payload['class_name'] = SummitExternalLocation::ClassName;
@ -877,7 +876,7 @@ final class OAuth2SummitLocationsApiController extends OAuth2ProtectedController
public function addHotel($summit_id){
try {
if(!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$summit = SummitFinderStrategyFactory::build($this->repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
$payload['class_name'] = SummitHotel::ClassName;
@ -920,7 +919,7 @@ final class OAuth2SummitLocationsApiController extends OAuth2ProtectedController
public function addAirport($summit_id){
try {
if(!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$summit = SummitFinderStrategyFactory::build($this->repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
$payload['class_name'] = SummitAirport::ClassName;
@ -965,7 +964,7 @@ final class OAuth2SummitLocationsApiController extends OAuth2ProtectedController
public function addVenueFloor($summit_id, $venue_id){
try {
if(!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$summit = SummitFinderStrategyFactory::build($this->repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
$rules = [
@ -1012,7 +1011,7 @@ final class OAuth2SummitLocationsApiController extends OAuth2ProtectedController
public function addVenueRoom($summit_id, $venue_id){
try {
if(!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$summit = SummitFinderStrategyFactory::build($this->repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
$payload['class_name'] = SummitVenueRoom::ClassName;
@ -1056,7 +1055,7 @@ final class OAuth2SummitLocationsApiController extends OAuth2ProtectedController
public function addVenueFloorRoom($summit_id, $venue_id, $floor_id){
try {
if(!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$summit = SummitFinderStrategyFactory::build($this->repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
$payload['class_name'] = SummitVenueRoom::ClassName;
@ -1107,7 +1106,7 @@ final class OAuth2SummitLocationsApiController extends OAuth2ProtectedController
try {
if(!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$summit = SummitFinderStrategyFactory::build($this->repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
@ -1153,7 +1152,7 @@ final class OAuth2SummitLocationsApiController extends OAuth2ProtectedController
try {
if(!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$summit = SummitFinderStrategyFactory::build($this->repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
@ -1199,7 +1198,7 @@ final class OAuth2SummitLocationsApiController extends OAuth2ProtectedController
public function updateVenueFloor($summit_id, $venue_id, $floor_id){
try {
if(!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$summit = SummitFinderStrategyFactory::build($this->repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
$rules = [
@ -1247,7 +1246,7 @@ final class OAuth2SummitLocationsApiController extends OAuth2ProtectedController
public function updateVenueRoom($summit_id, $venue_id, $room_id){
try {
if(!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$summit = SummitFinderStrategyFactory::build($this->repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
$payload['class_name'] = SummitVenueRoom::ClassName;
@ -1293,7 +1292,7 @@ final class OAuth2SummitLocationsApiController extends OAuth2ProtectedController
public function updateVenueFloorRoom($summit_id, $venue_id, $floor_id, $room_id){
try {
if(!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$summit = SummitFinderStrategyFactory::build($this->repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
$payload['class_name'] = SummitVenueRoom::ClassName;
@ -1342,7 +1341,7 @@ final class OAuth2SummitLocationsApiController extends OAuth2ProtectedController
try {
if(!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$summit = SummitFinderStrategyFactory::build($this->repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
@ -1388,7 +1387,7 @@ final class OAuth2SummitLocationsApiController extends OAuth2ProtectedController
try {
if(!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$summit = SummitFinderStrategyFactory::build($this->repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
@ -1434,7 +1433,7 @@ final class OAuth2SummitLocationsApiController extends OAuth2ProtectedController
try {
if(!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$summit = SummitFinderStrategyFactory::build($this->repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
@ -1565,7 +1564,7 @@ final class OAuth2SummitLocationsApiController extends OAuth2ProtectedController
* @return mixed
*/
public function getLocationBanners($summit_id, $location_id){
$values = Input::all();
$values = Request::all();
$rules = [
'page' => 'integer|min:1',
'per_page' => sprintf('required_with:page|integer|min:%s|max:%s', PagingConstants::MinPageSize, PagingConstants::MaxPageSize),
@ -1590,15 +1589,15 @@ final class OAuth2SummitLocationsApiController extends OAuth2ProtectedController
$page = 1;
$per_page = PagingConstants::DefaultPageSize;
if (Input::has('page')) {
$page = intval(Input::get('page'));
$per_page = intval(Input::get('per_page'));
if (Request::has('page')) {
$page = intval(Request::input('page'));
$per_page = intval(Request::input('per_page'));
}
$filter = null;
if (Input::has('filter')) {
$filter = FilterParser::parse(Input::get('filter'), [
if (Request::has('filter')) {
$filter = FilterParser::parse(Request::input('filter'), [
'class_name' => ['=='],
'title' => ['==', '=@'],
'content' => ['=@'],
@ -1629,9 +1628,9 @@ final class OAuth2SummitLocationsApiController extends OAuth2ProtectedController
$order = null;
if (Input::has('order'))
if (Request::has('order'))
{
$order = OrderParser::parse(Input::get('order'), [
$order = OrderParser::parse(Request::input('order'), [
'id',
'title',
'start_date',
@ -1682,7 +1681,7 @@ final class OAuth2SummitLocationsApiController extends OAuth2ProtectedController
try {
if(!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$summit = SummitFinderStrategyFactory::build($this->repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
@ -1775,7 +1774,7 @@ final class OAuth2SummitLocationsApiController extends OAuth2ProtectedController
try {
if(!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$summit = SummitFinderStrategyFactory::build($this->repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();

39
app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitMembersApiController.php
View File

@ -32,7 +32,6 @@ use utils\FilterParserException;
use utils\OrderParser;
use utils\PagingInfo;
use utils\PagingResponse;
use Illuminate\Support\Facades\Input;
use Exception;
/**
* Class OAuth2SummitMembersApiController
@ -129,7 +128,7 @@ final class OAuth2SummitMembersApiController extends OAuth2ProtectedController
$favorites
);
return $this->ok($response->toArray($expand = Input::get('expand','')));
return $this->ok($response->toArray($expand = Request::input('expand','')));
}
catch (ValidationException $ex1)
{
@ -265,7 +264,7 @@ final class OAuth2SummitMembersApiController extends OAuth2ProtectedController
$schedule
);
return $this->ok($response->toArray($expand = Input::get('expand','')));
return $this->ok($response->toArray($expand = Request::input('expand','')));
}
catch (ValidationException $ex1)
{
@ -378,7 +377,7 @@ final class OAuth2SummitMembersApiController extends OAuth2ProtectedController
* @return \Illuminate\Http\JsonResponse|mixed
*/
public function getAllBySummit($summit_id){
$values = Input::all();
$values = Request::all();
$rules = [
'page' => 'integer|min:1',
@ -401,15 +400,15 @@ final class OAuth2SummitMembersApiController extends OAuth2ProtectedController
$page = 1;
$per_page = PagingConstants::DefaultPageSize;;
if (Input::has('page')) {
$page = intval(Input::get('page'));
$per_page = intval(Input::get('per_page'));
if (Request::has('page')) {
$page = intval(Request::input('page'));
$per_page = intval(Request::input('per_page'));
}
$filter = null;
if (Input::has('filter')) {
$filter = FilterParser::parse(Input::get('filter'), [
if (Request::has('filter')) {
$filter = FilterParser::parse(Request::input('filter'), [
'irc' => ['=@', '=='],
'twitter' => ['=@', '=='],
'first_name' => ['=@', '=='],
@ -448,9 +447,9 @@ final class OAuth2SummitMembersApiController extends OAuth2ProtectedController
$order = null;
if (Input::has('order'))
if (Request::has('order'))
{
$order = OrderParser::parse(Input::get('order'), [
$order = OrderParser::parse(Request::input('order'), [
'first_name',
'last_name',
'id',
@ -501,7 +500,7 @@ final class OAuth2SummitMembersApiController extends OAuth2ProtectedController
* @return \Illuminate\Http\JsonResponse|mixed
*/
public function getAllBySummitCSV($summit_id){
$values = Input::all();
$values = Request::all();
$allowed_columns = [
"id",
@ -545,15 +544,15 @@ final class OAuth2SummitMembersApiController extends OAuth2ProtectedController
$page = 1;
$per_page = PHP_INT_MAX;
if (Input::has('page')) {
$page = intval(Input::get('page'));
$per_page = intval(Input::get('per_page'));
if (Request::has('page')) {
$page = intval(Request::input('page'));
$per_page = intval(Request::input('per_page'));
}
$filter = null;
if (Input::has('filter')) {
$filter = FilterParser::parse(Input::get('filter'), [
if (Request::has('filter')) {
$filter = FilterParser::parse(Request::input('filter'), [
'irc' => ['=@', '=='],
'twitter' => ['=@', '=='],
'first_name' => ['=@', '=='],
@ -592,9 +591,9 @@ final class OAuth2SummitMembersApiController extends OAuth2ProtectedController
$order = null;
if (Input::has('order'))
if (Request::has('order'))
{
$order = OrderParser::parse(Input::get('order'), [
$order = OrderParser::parse(Request::input('order'), [
'first_name',
'last_name',
'id',
@ -613,7 +612,7 @@ final class OAuth2SummitMembersApiController extends OAuth2ProtectedController
$relations = Request::input('relations', '');
$relations = !empty($relations) ? explode(',', $relations) : [];
$columns_param = Input::get("columns", "");
$columns_param = Request::input("columns", "");
$columns = [];
if(!empty($columns_param))
$columns = explode(',', $columns_param);

9
app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitMetricsApiController.php
View File

@ -12,7 +12,6 @@
* limitations under the License.
**/
use App\Services\Model\ISummitMetricService;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Validator;
@ -76,9 +75,9 @@ final class OAuth2SummitMetricsApiController extends OAuth2ProtectedController
$current_member = $this->resource_server_context->getCurrentUser();
if (is_null($current_member)) return $this->error403();
$payload = Input::all();
$payload = Request::all();
if(Request::isJson()){
$payload = Input::json()->all();
$payload = Request::json()->all();
}
$validation = Validator::make($payload,
@ -134,9 +133,9 @@ final class OAuth2SummitMetricsApiController extends OAuth2ProtectedController
$current_member = $this->resource_server_context->getCurrentUser();
if (is_null($current_member)) return $this->error403();
$payload = Input::all();
$payload = Request::all();
if(Request::isJson()){
$payload = Input::json()->all();
$payload = Request::json()->all();
}
$validation = Validator::make($payload,

5
app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitNotificationsApiController.php
View File

@ -20,7 +20,6 @@ use models\main\IMemberRepository;
use models\oauth2\IResourceServerContext;
use models\summit\ISummitNotificationRepository;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Input;
use models\summit\ISummitRepository;
use ModelSerializers\SerializerRegistry;
use utils\Filter;
@ -287,7 +286,7 @@ class OAuth2SummitNotificationsApiController extends OAuth2ProtectedController
$notification = $summit->getNotificationById($notification_id);
if(is_null($notification))
return $this->error404();
return $this->ok(SerializerRegistry::getInstance()->getSerializer($notification)->serialize( Request::input('expand', '')));
return $this->ok(SerializerRegistry::getInstance()->getSerializer($notification)->serialize(Request::input('expand', '')));
} catch (ValidationException $ex1) {
Log::warning($ex1);
return $this->error412(array($ex1->getMessage()));
@ -380,7 +379,7 @@ class OAuth2SummitNotificationsApiController extends OAuth2ProtectedController
try {
if(!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();

5
app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitOrderExtraQuestionTypeApiController.php
View File

@ -14,7 +14,6 @@
use App\Models\Foundation\Summit\Repositories\ISummitOrderExtraQuestionTypeRepository;
use App\Services\Model\ISummitOrderExtraQuestionTypeService;
use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Request;
use libs\utils\HTMLCleaner;
@ -204,7 +203,7 @@ final class OAuth2SummitOrderExtraQuestionTypeApiController
public function addQuestionValue($summit_id, $question_id){
try {
if(!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$payload = $data->all();
$summit = SummitFinderStrategyFactory::build($this->getSummitRepository(), $this->getResourceServerContext())->find($summit_id);
if (is_null($summit)) return $this->error404();
@ -250,7 +249,7 @@ final class OAuth2SummitOrderExtraQuestionTypeApiController
try {
if(!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$payload = $data->all();
$summit = SummitFinderStrategyFactory::build($this->getSummitRepository(), $this->getResourceServerContext())->find($summit_id);
if (is_null($summit)) return $this->error404();

9
app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitOrdersApiController.php
View File

@ -115,12 +115,14 @@ final class OAuth2SummitOrdersApiController
], $validation_rules);
}
else{
if(empty($owner->getFirstName())){
if(is_null($owner->getFirstName())){
$validation_rules = array_merge([
'owner_first_name' => 'required|string|max:255',
], $validation_rules);
}
if(empty($owner->getLastName())){
if(is_null($owner->getLastName())){
$validation_rules = array_merge([
'owner_last_name' => 'required|string|max:255',
], $validation_rules);
@ -128,6 +130,7 @@ final class OAuth2SummitOrdersApiController
}
$payload = $this->getJsonPayload($validation_rules);
if(!is_null($owner)){
$payload_ex = [
'owner_first_name' => !empty($owner->getFirstName()) ? $owner->getFirstName() : $payload['owner_first_name'],
@ -519,7 +522,7 @@ final class OAuth2SummitOrdersApiController
$order = $this->service->cancelRequestRefundOrder(intval($order_id));
return $this->updated(SerializerRegistry::getInstance()->getSerializer($order)->serialize( Request::input('expand', '')));
return $this->updated(SerializerRegistry::getInstance()->getSerializer($order)->serialize(Request::input('expand', '')));
}
catch (ValidationException $ex) {

5
app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitPresentationActionApiController.php
View File

@ -12,7 +12,6 @@
* limitations under the License.
**/
use App\Services\Model\ISummitPresentationActionService;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Request;
use models\exceptions\EntityNotFoundException;
@ -80,7 +79,7 @@ final class OAuth2SummitPresentationActionApiController
return $this->error403();
$action = $this->service->updateAction($summit, intval($selection_plan_id), intval($presentation_id), intval($action_id), true );
return $this->updated(SerializerRegistry::getInstance()->getSerializer($action)->serialize(Input::get('expand', '')));
return $this->updated(SerializerRegistry::getInstance()->getSerializer($action)->serialize(Request::input('expand', '')));
} catch (ValidationException $ex) {
Log::warning($ex);
@ -118,7 +117,7 @@ final class OAuth2SummitPresentationActionApiController
$action = $this->service->updateAction($summit, intval($selection_plan_id), intval($presentation_id), intval($action_id), false );
return $this->updated(SerializerRegistry::getInstance()->getSerializer($action)->serialize(Input::get('expand', '')));
return $this->updated(SerializerRegistry::getInstance()->getSerializer($action)->serialize(Request::input('expand', '')));
} catch (ValidationException $ex) {
Log::warning($ex);
return $this->error412($ex->getMessages());

37
app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitPromoCodesApiController.php
View File

@ -28,7 +28,6 @@ use services\model\ISummitPromoCodeService;
use utils\Filter;
use utils\FilterParser;
use utils\OrderParser;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Validator;
use utils\PagingInfo;
use Exception;
@ -87,7 +86,7 @@ final class OAuth2SummitPromoCodesApiController extends OAuth2ProtectedControlle
* @return mixed
*/
public function getAllBySummit($summit_id){
$values = Input::all();
$values = Request::all();
$rules = [
'page' => 'integer|min:1',
@ -110,15 +109,15 @@ final class OAuth2SummitPromoCodesApiController extends OAuth2ProtectedControlle
$page = 1;
$per_page = PagingConstants::DefaultPageSize;;
if (Input::has('page')) {
$page = intval(Input::get('page'));
$per_page = intval(Input::get('per_page'));
if (Request::has('page')) {
$page = intval(Request::input('page'));
$per_page = intval(Request::input('per_page'));
}
$filter = null;
if (Input::has('filter')) {
$filter = FilterParser::parse(Input::get('filter'), [
if (Request::has('filter')) {
$filter = FilterParser::parse(Request::input('filter'), [
'code' => ['=@', '=='],
'creator' => ['=@', '=='],
@ -161,9 +160,9 @@ final class OAuth2SummitPromoCodesApiController extends OAuth2ProtectedControlle
$order = null;
if (Input::has('order'))
if (Request::has('order'))
{
$order = OrderParser::parse(Input::get('order'), [
$order = OrderParser::parse(Request::input('order'), [
'id',
'code',
@ -209,7 +208,7 @@ final class OAuth2SummitPromoCodesApiController extends OAuth2ProtectedControlle
* @return \Illuminate\Http\Response|mixed
*/
public function getAllBySummitCSV($summit_id){
$values = Input::all();
$values = Request::all();
$rules = [];
$allowed_columns = [
"id",
@ -246,8 +245,8 @@ final class OAuth2SummitPromoCodesApiController extends OAuth2ProtectedControlle
$per_page = PHP_INT_MAX;
$filter = null;
if (Input::has('filter')) {
$filter = FilterParser::parse(Input::get('filter'), [
if (Request::has('filter')) {
$filter = FilterParser::parse(Request::input('filter'), [
'code' => ['=@', '=='],
'creator' => ['=@', '=='],
'creator_email' => ['=@', '=='],
@ -289,15 +288,15 @@ final class OAuth2SummitPromoCodesApiController extends OAuth2ProtectedControlle
$order = null;
if (Input::has('order'))
if (Request::has('order'))
{
$order = OrderParser::parse(Input::get('order'), [
$order = OrderParser::parse(Request::input('order'), [
'id',
'code',
]);
}
$columns_param = Input::get("columns", "");
$columns_param = Request::input("columns", "");
$columns = [];
if(!empty($columns_param))
$columns = explode(',', $columns_param);
@ -308,7 +307,7 @@ final class OAuth2SummitPromoCodesApiController extends OAuth2ProtectedControlle
$data = $this->promo_code_repository->getBySummit($summit, new PagingInfo($page, $per_page), $filter, $order);
$filename = "promocodes-" . date('Ymd');
$list = $data->toArray(Input::get("expand", ""));
$list = $data->toArray(Request::input("expand", ""));
return $this->export
(
@ -366,7 +365,7 @@ final class OAuth2SummitPromoCodesApiController extends OAuth2ProtectedControlle
public function addPromoCodeBySummit($summit_id){
try {
if(!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
@ -412,7 +411,7 @@ final class OAuth2SummitPromoCodesApiController extends OAuth2ProtectedControlle
{
try {
if (!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
@ -587,7 +586,7 @@ final class OAuth2SummitPromoCodesApiController extends OAuth2ProtectedControlle
if (is_null($summit)) return $this->error404();
$payload = [];
if (Request::isJson()) {
$data = Input::json();
$data = Request::json();
$payload = $data->all();
$discount_code_rules = [
'amount' => 'sometimes|required_without:rate|numeric|min:0',

29
app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitRSVPTemplatesApiController.php
View File

@ -15,7 +15,6 @@ use App\Http\Utils\PagingConstants;
use App\Models\Foundation\Summit\Events\RSVP\RSVPMultiValueQuestionTemplate;
use App\Models\Foundation\Summit\Repositories\IRSVPTemplateRepository;
use App\Services\Model\IRSVPTemplateService;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Validator;
@ -91,7 +90,7 @@ final class OAuth2SummitRSVPTemplatesApiController extends OAuth2ProtectedContro
*/
public function getAllBySummit($summit_id){
$values = Input::all();
$values = Request::all();
$rules = [
'page' => 'integer|min:1',
'per_page' => sprintf('required_with:page|integer|min:%s|max:%s', PagingConstants::MinPageSize, PagingConstants::MaxPageSize),
@ -114,15 +113,15 @@ final class OAuth2SummitRSVPTemplatesApiController extends OAuth2ProtectedContro
$page = 1;
$per_page = PagingConstants::DefaultPageSize;
if (Input::has('page')) {
$page = intval(Input::get('page'));
$per_page = intval(Input::get('per_page'));
if (Request::has('page')) {
$page = intval(Request::input('page'));
$per_page = intval(Request::input('per_page'));
}
$filter = null;
if (Input::has('filter')) {
$filter = FilterParser::parse(Input::get('filter'), [
if (Request::has('filter')) {
$filter = FilterParser::parse(Request::input('filter'), [
'title' => ['=@', '=='],
'is_enabled' => [ '=='],
]);
@ -137,9 +136,9 @@ final class OAuth2SummitRSVPTemplatesApiController extends OAuth2ProtectedContro
$order = null;
if (Input::has('order'))
if (Request::has('order'))
{
$order = OrderParser::parse(Input::get('order'), [
$order = OrderParser::parse(Request::input('order'), [
'id',
'title',
]);
@ -270,7 +269,7 @@ final class OAuth2SummitRSVPTemplatesApiController extends OAuth2ProtectedContro
try {
if(!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
@ -316,7 +315,7 @@ final class OAuth2SummitRSVPTemplatesApiController extends OAuth2ProtectedContro
try {
if(!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
@ -400,7 +399,7 @@ final class OAuth2SummitRSVPTemplatesApiController extends OAuth2ProtectedContro
try {
if(!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
@ -447,7 +446,7 @@ final class OAuth2SummitRSVPTemplatesApiController extends OAuth2ProtectedContro
try {
if(!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
@ -570,7 +569,7 @@ final class OAuth2SummitRSVPTemplatesApiController extends OAuth2ProtectedContro
try {
if(!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
@ -618,7 +617,7 @@ final class OAuth2SummitRSVPTemplatesApiController extends OAuth2ProtectedContro
try {
if(!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();

11
app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitRegistrationInvitationApiController.php
View File

@ -18,7 +18,6 @@ use App\Jobs\Emails\Registration\Invitations\ReInviteSummitRegistrationEmail;
use App\Models\Foundation\Summit\Repositories\ISummitRegistrationInvitationRepository;
use App\Services\Model\ISummitRegistrationInvitationService;
use Illuminate\Http\Request as LaravelRequest;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Validator;
@ -307,7 +306,7 @@ final class OAuth2SummitRegistrationInvitationApiController extends OAuth2Protec
'is_sent',
];
$columns_param = Input::get("columns", "");
$columns_param = Request::input("columns", "");
$columns = [];
if(!empty($columns_param))
$columns = explode(',', $columns_param);
@ -411,7 +410,7 @@ final class OAuth2SummitRegistrationInvitationApiController extends OAuth2Protec
try {
if(!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$summit = SummitFinderStrategyFactory::build($this->getSummitRepository(), $this->getResourceServerContext())->find($summit_id);
if (is_null($summit)) return $this->error404();
@ -438,8 +437,8 @@ final class OAuth2SummitRegistrationInvitationApiController extends OAuth2Protec
$filter = null;
if (Input::has('filter')) {
$filter = FilterParser::parse(Input::get('filter'), [
if (Request::has('filter')) {
$filter = FilterParser::parse(Request::input('filter'), [
'is_accepted' => ['=='],
'is_sent' => ['=='],
]);
@ -453,7 +452,7 @@ final class OAuth2SummitRegistrationInvitationApiController extends OAuth2Protec
'is_sent' => 'sometimes|required|string|in:true,false',
]);
$this->service->triggerSend($summit, $payload, Input::get('filter'));
$this->service->triggerSend($summit, $payload, Request::input('filter'));
return $this->ok();

4
app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitSelectionPlansApiController.php
View File

@ -743,8 +743,8 @@ final class OAuth2SummitSelectionPlansApiController extends OAuth2ProtectedContr
'summit_id' => ['=='],
'new_category_id' => ['=='],
'old_category_id' => ['=='],
'new_category_title' => ['=@', '=='],
'old_category_title' => ['=@', '=='],
'new_category_name' => ['=@', '=='],
'old_category_name' => ['=@', '=='],
'requester_fullname' => ['=@', '=='],
'requester_email' => ['=@', '=='],
'aprover_fullname' => ['=@', '=='],

15
app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitSpeakersApiController.php
View File

@ -14,7 +14,6 @@
use App\Models\Foundation\Summit\Repositories\ISelectionPlanRepository;
use Exception;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Validator;
@ -551,7 +550,7 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
{
try {
if (!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$summit = SummitFinderStrategyFactory::build($this->repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
@ -627,7 +626,7 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
{
try {
if (!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$summit = SummitFinderStrategyFactory::build($this->repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
@ -729,7 +728,7 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
{
try {
if (!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$speaker_from = $this->speaker_repository->getById($speaker_from_id);
if (is_null($speaker_from)) return $this->error404();
@ -759,7 +758,7 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
{
try {
if (!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$current_member = $this->resource_server_context->getCurrentUser();
if (is_null($current_member)) return $this->error403();
@ -833,7 +832,7 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
{
try {
if (!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$current_member = $this->resource_server_context->getCurrentUser();
if (is_null($current_member)) return $this->error403();
@ -971,7 +970,7 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
$presentations
);
return $this->ok($response->toArray($expand = Input::get('expand', '')));
return $this->ok($response->toArray($expand = Request::input('expand', '')));
} catch (ValidationException $ex1) {
Log::warning($ex1);
return $this->error412(array($ex1->getMessage()));
@ -1025,7 +1024,7 @@ final class OAuth2SummitSpeakersApiController extends OAuth2ProtectedController
$presentations
);
return $this->ok($response->toArray($expand = Input::get('expand', '')));
return $this->ok($response->toArray($expand = Request::input('expand', '')));
} catch (ValidationException $ex1) {
Log::warning($ex1);
return $this->error412(array($ex1->getMessage()));

35
app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitSpeakersAssistanceApiController.php
View File

@ -15,7 +15,6 @@
use App\Http\Utils\BooleanCellFormatter;
use App\Http\Utils\EpochCellFormatter;
use App\Models\Foundation\Summit\Repositories\IPresentationSpeakerSummitAssistanceConfirmationRequestRepository;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Validator;
@ -83,7 +82,7 @@ final class OAuth2SummitSpeakersAssistanceApiController extends OAuth2ProtectedC
$summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
$values = Input::all();
$values = Request::all();
$rules = array
(
@ -103,15 +102,15 @@ final class OAuth2SummitSpeakersAssistanceApiController extends OAuth2ProtectedC
$page = 1;
$per_page = 10;
if (Input::has('page')) {
$page = intval(Input::get('page'));
$per_page = intval(Input::get('per_page'));
if (Request::has('page')) {
$page = intval(Request::input('page'));
$per_page = intval(Request::input('per_page'));
}
$filter = null;
if (Input::has('filter')) {
$filter = FilterParser::parse(Input::get('filter'), [
if (Request::has('filter')) {
$filter = FilterParser::parse(Request::input('filter'), [
'id' => ['=='],
'on_site_phone' => ['==', '=@'],
'speaker_email' => ['==', '=@'],
@ -123,8 +122,8 @@ final class OAuth2SummitSpeakersAssistanceApiController extends OAuth2ProtectedC
}
$order = null;
if (Input::has('order')) {
$order = OrderParser::parse(Input::get('order'), [
if (Request::has('order')) {
$order = OrderParser::parse(Request::input('order'), [
'id',
'is_confirmed',
'confirmation_date',
@ -175,15 +174,15 @@ final class OAuth2SummitSpeakersAssistanceApiController extends OAuth2ProtectedC
$page = 1;
$per_page = PHP_INT_MAX;
if (Input::has('page')) {
$page = intval(Input::get('page'));
$per_page = intval(Input::get('per_page'));
if (Request::has('page')) {
$page = intval(Request::input('page'));
$per_page = intval(Request::input('per_page'));
}
$filter = null;
if (Input::has('filter')) {
$filter = FilterParser::parse(Input::get('filter'), [
if (Request::has('filter')) {
$filter = FilterParser::parse(Request::input('filter'), [
'id' => ['=='],
'on_site_phone' => ['==', '=@'],
'speaker_email' => ['==', '=@'],
@ -195,8 +194,8 @@ final class OAuth2SummitSpeakersAssistanceApiController extends OAuth2ProtectedC
}
$order = null;
if (Input::has('order')) {
$order = OrderParser::parse(Input::get('order'), [
if (Request::has('order')) {
$order = OrderParser::parse(Request::input('order'), [
'id',
'is_confirmed',
'confirmation_date',
@ -244,7 +243,7 @@ final class OAuth2SummitSpeakersAssistanceApiController extends OAuth2ProtectedC
{
try {
if(!Request::isJson()) return $this->error400();
$data = Input::json()->all();
$data = Request::json()->all();
$summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
@ -296,7 +295,7 @@ final class OAuth2SummitSpeakersAssistanceApiController extends OAuth2ProtectedC
{
try {
if(!Request::isJson()) return $this->error400();
$data = Input::json()->all();
$data = Request::json()->all();
$summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();

3
app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitTicketApiController.php
View File

@ -15,7 +15,6 @@ use App\Http\Utils\EpochCellFormatter;
use App\Jobs\IngestSummitExternalRegistrationData;
use App\ModelSerializers\ISummitAttendeeTicketSerializerTypes;
use App\Services\Model\ISummitOrderService;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Request;
use models\exceptions\EntityNotFoundException;
@ -236,7 +235,7 @@ final class OAuth2SummitTicketApiController extends OAuth2ProtectedController
$allowed_columns[] = $question->getLabel();
}
$columns_param = Input::get("columns", "");
$columns_param = Request::input("columns", "");
$columns = [];
if(!empty($columns_param))
$columns = explode(',', $columns_param);

3
app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitTrackChairsApiController.php
View File

@ -17,7 +17,6 @@ use App\Http\Utils\EpochCellFormatter;
use App\Models\Foundation\Main\IGroup;
use App\Models\Foundation\Summit\Repositories\ISummitTrackChairRepository;
use App\Services\Model\ITrackChairService;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Request;
use models\exceptions\EntityNotFoundException;
@ -206,7 +205,7 @@ final class OAuth2SummitTrackChairsApiController
'summit_id'
];
$columns_param = Input::get("columns", "");
$columns_param = Request::input("columns", "");
$columns = [];
if(!empty($columns_param))
$columns = explode(',', $columns_param);

23
app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitTrackTagGroupsApiController.php
View File

@ -14,7 +14,6 @@
use App\Models\Foundation\Summit\Repositories\ITrackTagGroupAllowedTagsRepository;
use App\Services\Model\ISummitTrackTagGroupService;
use models\oauth2\IResourceServerContext;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Validator;
use ModelSerializers\SerializerRegistry;
use utils\Filter;
@ -88,7 +87,7 @@ final class OAuth2SummitTrackTagGroupsApiController extends OAuth2ProtectedContr
$track_tag_groups
);
return $this->ok($response->toArray($expand = Input::get('expand','')));
return $this->ok($response->toArray($expand = Request::input('expand','')));
}
catch (EntityNotFoundException $ex1) {
@ -115,7 +114,7 @@ final class OAuth2SummitTrackTagGroupsApiController extends OAuth2ProtectedContr
*/
public function getAllowedTags($summit_id){
$values = Input::all();
$values = Request::all();
$rules = [
'page' => 'integer|min:1',
@ -138,15 +137,15 @@ final class OAuth2SummitTrackTagGroupsApiController extends OAuth2ProtectedContr
$page = 1;
$per_page = 5;
if (Input::has('page')) {
$page = intval(Input::get('page'));
$per_page = intval(Input::get('per_page'));
if (Request::has('page')) {
$page = intval(Request::input('page'));
$per_page = intval(Request::input('per_page'));
}
$filter = null;
if (Input::has('filter')) {
$filter = FilterParser::parse(Input::get('filter'), array
if (Request::has('filter')) {
$filter = FilterParser::parse(Request::input('filter'), array
(
'tag' => ['=@', '=='],
));
@ -154,9 +153,9 @@ final class OAuth2SummitTrackTagGroupsApiController extends OAuth2ProtectedContr
$order = null;
if (Input::has('order'))
if (Request::has('order'))
{
$order = OrderParser::parse(Input::get('order'), array
$order = OrderParser::parse(Request::input('order'), array
(
'tag',
'id',
@ -207,7 +206,7 @@ final class OAuth2SummitTrackTagGroupsApiController extends OAuth2ProtectedContr
public function addTrackTagGroup($summit_id){
try {
if(!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
@ -258,7 +257,7 @@ final class OAuth2SummitTrackTagGroupsApiController extends OAuth2ProtectedContr
public function updateTrackTagGroup($summit_id, $track_tag_group_id){
try {
if(!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$summit = SummitFinderStrategyFactory::build
(

37
app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitTracksApiController.php
View File

@ -18,7 +18,6 @@ use App\Models\Foundation\Summit\Repositories\ISummitTrackRepository;
use App\Services\Model\ISummitTrackService;
use Illuminate\Http\Request as LaravelRequest;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Validator;
use models\exceptions\ValidationException;
@ -75,7 +74,7 @@ final class OAuth2SummitTracksApiController extends OAuth2ProtectedController
* @return mixed
*/
public function getAllBySummit($summit_id){
$values = Input::all();
$values = Request::all();
$rules = [
'page' => 'integer|min:1',
@ -98,15 +97,15 @@ final class OAuth2SummitTracksApiController extends OAuth2ProtectedController
$page = 1;
$per_page = PagingConstants::DefaultPageSize;;
if (Input::has('page')) {
$page = intval(Input::get('page'));
$per_page = intval(Input::get('per_page'));
if (Request::has('page')) {
$page = intval(Request::input('page'));
$per_page = intval(Request::input('per_page'));
}
$filter = null;
if (Input::has('filter')) {
$filter = FilterParser::parse(Input::get('filter'), [
if (Request::has('filter')) {
$filter = FilterParser::parse(Request::input('filter'), [
'name' => ['=@', '=='],
'description' => ['=@', '=='],
'code' => ['=@', '=='],
@ -130,9 +129,9 @@ final class OAuth2SummitTracksApiController extends OAuth2ProtectedController
$order = null;
if (Input::has('order'))
if (Request::has('order'))
{
$order = OrderParser::parse(Input::get('order'), [
$order = OrderParser::parse(Request::input('order'), [
'id',
'code',
@ -179,7 +178,7 @@ final class OAuth2SummitTracksApiController extends OAuth2ProtectedController
* @return mixed
*/
public function getAllBySummitCSV($summit_id){
$values = Input::all();
$values = Request::all();
$rules = [];
try {
@ -198,15 +197,15 @@ final class OAuth2SummitTracksApiController extends OAuth2ProtectedController
$page = 1;
$per_page = PHP_INT_MAX;
if (Input::has('page')) {
$page = intval(Input::get('page'));
$per_page = intval(Input::get('per_page'));
if (Request::has('page')) {
$page = intval(Request::input('page'));
$per_page = intval(Request::input('per_page'));
}
$filter = null;
if (Input::has('filter')) {
$filter = FilterParser::parse(Input::get('filter'), [
if (Request::has('filter')) {
$filter = FilterParser::parse(Request::input('filter'), [
'title' => ['=@', '=='],
'description' => ['=@', '=='],
'code' => ['=@', '=='],
@ -229,9 +228,9 @@ final class OAuth2SummitTracksApiController extends OAuth2ProtectedController
$order = null;
if (Input::has('order'))
if (Request::has('order'))
{
$order = OrderParser::parse(Input::get('order'), [
$order = OrderParser::parse(Request::input('order'), [
'id',
'code',
@ -446,7 +445,7 @@ final class OAuth2SummitTracksApiController extends OAuth2ProtectedController
public function addTrackBySummit($summit_id){
try {
if(!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
@ -546,7 +545,7 @@ final class OAuth2SummitTracksApiController extends OAuth2ProtectedController
public function updateTrackBySummit($summit_id, $track_id){
try {
if(!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();

38
app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitsEventTypesApiController.php
View File

@ -17,7 +17,6 @@ use App\Services\Model\ISummitEventTypeService;
use Illuminate\Support\Facades\Request;
use App\Models\Foundation\Summit\Events\SummitEventTypeConstants;
use App\Models\Foundation\Summit\Repositories\ISummitEventTypeRepository;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Validator;
use models\exceptions\ValidationException;
@ -26,7 +25,6 @@ use models\summit\ISummitRepository;
use models\exceptions\EntityNotFoundException;
use ModelSerializers\SerializerRegistry;
use utils\Filter;
use utils\FilterElement;
use utils\FilterParser;
use utils\OrderParser;
use utils\PagingInfo;
@ -74,7 +72,7 @@ final class OAuth2SummitsEventTypesApiController extends OAuth2ProtectedControll
* @return mixed
*/
public function getAllBySummit($summit_id){
$values = Input::all();
$values = Request::all();
$rules = [
'page' => 'integer|min:1',
@ -97,15 +95,15 @@ final class OAuth2SummitsEventTypesApiController extends OAuth2ProtectedControll
$page = 1;
$per_page = 5;
if (Input::has('page')) {
$page = intval(Input::get('page'));
$per_page = intval(Input::get('per_page'));
if (Request::has('page')) {
$page = intval(Request::input('page'));
$per_page = intval(Request::input('per_page'));
}
$filter = null;
if (Input::has('filter')) {
$filter = FilterParser::parse(Input::get('filter'), [
if (Request::has('filter')) {
$filter = FilterParser::parse(Request::input('filter'), [
'name' => ['=@', '=='],
'class_name' => ['=='],
'is_default' => ['=='],
@ -146,9 +144,9 @@ final class OAuth2SummitsEventTypesApiController extends OAuth2ProtectedControll
$order = null;
if (Input::has('order'))
if (Request::has('order'))
{
$order = OrderParser::parse(Input::get('order'), [
$order = OrderParser::parse(Request::input('order'), [
'id',
'name',
@ -194,7 +192,7 @@ final class OAuth2SummitsEventTypesApiController extends OAuth2ProtectedControll
* @return mixed
*/
public function getAllBySummitCSV($summit_id){
$values = Input::all();
$values = Request::all();
$rules = [
];
@ -214,15 +212,15 @@ final class OAuth2SummitsEventTypesApiController extends OAuth2ProtectedControll
$page = 1;
$per_page = PHP_INT_MAX;
if (Input::has('page')) {
$page = intval(Input::get('page'));
$per_page = intval(Input::get('per_page'));
if (Request::has('page')) {
$page = intval(Request::input('page'));
$per_page = intval(Request::input('per_page'));
}
$filter = null;
if (Input::has('filter')) {
$filter = FilterParser::parse(Input::get('filter'), [
if (Request::has('filter')) {
$filter = FilterParser::parse(Request::input('filter'), [
'name' => ['=@', '=='],
'class_name' => ['=='],
'is_default' => ['=='],
@ -263,9 +261,9 @@ final class OAuth2SummitsEventTypesApiController extends OAuth2ProtectedControll
$order = null;
if (Input::has('order'))
if (Request::has('order'))
{
$order = OrderParser::parse(Input::get('order'), [
$order = OrderParser::parse(Request::input('order'), [
'id',
'name',
@ -351,7 +349,7 @@ final class OAuth2SummitsEventTypesApiController extends OAuth2ProtectedControll
try {
if(!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
@ -397,7 +395,7 @@ final class OAuth2SummitsEventTypesApiController extends OAuth2ProtectedControll
{
try {
if (!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();

35
app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitsTicketTypesApiController.php
View File

@ -16,7 +16,6 @@ use App\Http\Utils\PagingConstants;
use App\Services\Model\ISummitTicketTypeService;
use Illuminate\Support\Facades\Request;
use models\summit\ISummitTicketTypeRepository;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Validator;
use models\exceptions\ValidationException;
@ -72,7 +71,7 @@ final class OAuth2SummitsTicketTypesApiController extends OAuth2ProtectedControl
* @return mixed
*/
public function getAllBySummit($summit_id){
$values = Input::all();
$values = Request::all();
$rules = [
'page' => 'integer|min:1',
@ -95,15 +94,15 @@ final class OAuth2SummitsTicketTypesApiController extends OAuth2ProtectedControl
$page = 1;
$per_page = PagingConstants::DefaultPageSize;
if (Input::has('page')) {
$page = intval(Input::get('page'));
$per_page = intval(Input::get('per_page'));
if (Request::has('page')) {
$page = intval(Request::input('page'));
$per_page = intval(Request::input('per_page'));
}
$filter = null;
if (Input::has('filter')) {
$filter = FilterParser::parse(Input::get('filter'), [
if (Request::has('filter')) {
$filter = FilterParser::parse(Request::input('filter'), [
'name' => ['=@', '=='],
'description' => ['=@', '=='],
'external_id' => ['=@', '=='],
@ -120,9 +119,9 @@ final class OAuth2SummitsTicketTypesApiController extends OAuth2ProtectedControl
$order = null;
if (Input::has('order'))
if (Request::has('order'))
{
$order = OrderParser::parse(Input::get('order'), [
$order = OrderParser::parse(Request::input('order'), [
'id',
'name',
'external_id'
@ -179,15 +178,15 @@ final class OAuth2SummitsTicketTypesApiController extends OAuth2ProtectedControl
$page = 1;
$per_page = PHP_INT_MAX;
if (Input::has('page')) {
$page = intval(Input::get('page'));
$per_page = intval(Input::get('per_page'));
if (Request::has('page')) {
$page = intval(Request::input('page'));
$per_page = intval(Request::input('per_page'));
}
$filter = null;
if (Input::has('filter')) {
$filter = FilterParser::parse(Input::get('filter'), [
if (Request::has('filter')) {
$filter = FilterParser::parse(Request::input('filter'), [
'name' => ['=@', '=='],
'description' => ['=@', '=='],
'external_id' => ['=@', '=='],
@ -205,9 +204,9 @@ final class OAuth2SummitsTicketTypesApiController extends OAuth2ProtectedControl
$order = null;
if (Input::has('order'))
if (Request::has('order'))
{
$order = OrderParser::parse(Input::get('order'), [
$order = OrderParser::parse(Request::input('order'), [
'id',
'name',
'external_id'
@ -283,7 +282,7 @@ final class OAuth2SummitsTicketTypesApiController extends OAuth2ProtectedControl
try {
if(!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$payload = $data->all();
$summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
@ -329,7 +328,7 @@ final class OAuth2SummitsTicketTypesApiController extends OAuth2ProtectedControl
try {
if(!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$payload = $data->all();
$summit = SummitFinderStrategyFactory::build($this->summit_repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();

25
app/Http/Controllers/Apis/Protected/Summit/OAuth2TrackQuestionsTemplateApiController.php
View File

@ -15,7 +15,6 @@ use App\Models\Foundation\Summit\Events\Presentations\TrackQuestions\TrackMultiV
use App\Models\Foundation\Summit\Events\Presentations\TrackQuestions\TrackQuestionTemplateConstants;
use App\Models\Foundation\Summit\Repositories\ITrackQuestionTemplateRepository;
use App\Services\Model\ITrackQuestionTemplateService;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Request;
use models\exceptions\EntityNotFoundException;
@ -66,7 +65,7 @@ final class OAuth2TrackQuestionsTemplateApiController extends OAuth2ProtectedCon
* @return mixed
*/
public function getTrackQuestionTemplates(){
$values = Input::all();
$values = Request::all();
$rules = [
'page' => 'integer|min:1',
@ -86,15 +85,15 @@ final class OAuth2TrackQuestionsTemplateApiController extends OAuth2ProtectedCon
$page = 1;
$per_page = 5;
if (Input::has('page')) {
$page = intval(Input::get('page'));
$per_page = intval(Input::get('per_page'));
if (Request::has('page')) {
$page = intval(Request::input('page'));
$per_page = intval(Request::input('per_page'));
}
$filter = null;
if (Input::has('filter')) {
$filter = FilterParser::parse(Input::get('filter'), [
if (Request::has('filter')) {
$filter = FilterParser::parse(Request::input('filter'), [
'name' => ['=@', '=='],
'label' => ['=@', '=='],
'class_name' => ['=='],
@ -117,9 +116,9 @@ final class OAuth2TrackQuestionsTemplateApiController extends OAuth2ProtectedCon
$order = null;
if (Input::has('order'))
if (Request::has('order'))
{
$order = OrderParser::parse(Input::get('order'), [
$order = OrderParser::parse(Request::input('order'), [
'id',
'name',
@ -168,7 +167,7 @@ final class OAuth2TrackQuestionsTemplateApiController extends OAuth2ProtectedCon
try {
if(!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$rules = TrackQuestionTemplateValidationRulesFactory::build($payload);
// Creates a Validator instance and validates the data.
@ -242,7 +241,7 @@ final class OAuth2TrackQuestionsTemplateApiController extends OAuth2ProtectedCon
try {
if(!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$rules = TrackQuestionTemplateValidationRulesFactory::build($payload, true);
// Creates a Validator instance and validates the data.
@ -358,7 +357,7 @@ final class OAuth2TrackQuestionsTemplateApiController extends OAuth2ProtectedCon
try {
if(!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$rules = TrackQuestionValueTemplateValidationRulesFactory::build($payload);
// Creates a Validator instance and validates the data.
@ -407,7 +406,7 @@ final class OAuth2TrackQuestionsTemplateApiController extends OAuth2ProtectedCon
try {
if(!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$rules = TrackQuestionValueTemplateValidationRulesFactory::build($payload, true);
// Creates a Validator instance and validates the data.

8
app/Http/Controllers/Apis/Protected/Summit/Strategies/events/RetrieveAllUnPublishedSummitEventsStrategy.php
View File

@ -11,13 +11,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
**/
use Illuminate\Support\Facades\Input;
use utils\Filter;
use utils\FilterParser;
use utils\Order;
use utils\OrderParser;
use Illuminate\Support\Facades\Request;
/**
* Class RetrieveAllUnPublishedSummitEventsStrategy
* @package App\Http\Controllers
@ -49,9 +47,9 @@ class RetrieveAllUnPublishedSummitEventsStrategy extends RetrieveAllSummitEvents
*/
protected function buildOrder(){
$order = null;
if (Input::has('order'))
if (Request::has('order'))
{
$order = OrderParser::parse(Input::get('order'), [
$order = OrderParser::parse(Request::input('order'), [
'title',
'start_date',
'end_date',

18
app/Http/Controllers/Apis/Protected/Summit/Strategies/events/RetrieveSummitEventsStrategy.php
View File

@ -17,9 +17,9 @@ use utils\Order;
use utils\OrderParser;
use utils\PagingResponse;
use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Facades\Input;
use utils\FilterParser;
use utils\PagingInfo;
use Illuminate\Support\Facades\Request;
/**
* Class RetrieveSummitEventsStrategy
* @package App\Http\Controllers
@ -32,9 +32,9 @@ abstract class RetrieveSummitEventsStrategy
$page = 1;
$per_page = 5;
if (Input::has('page')) {
$page = intval(Input::get('page'));
$per_page = intval(Input::get('per_page'));
if (Request::has('page')) {
$page = intval(Request::input('page'));
$per_page = intval(Request::input('per_page'));
}
return [$page, $per_page];
@ -47,7 +47,7 @@ abstract class RetrieveSummitEventsStrategy
*/
public function getEvents(array $params = [])
{
$values = Input::all();
$values = Request::all();
$rules = [
'page' => 'integer|min:1',
@ -77,8 +77,8 @@ abstract class RetrieveSummitEventsStrategy
$filter = null;
if (Input::has('filter')) {
$filter = FilterParser::parse(Input::get('filter'), $this->getValidFilters());
if (Request::has('filter')) {
$filter = FilterParser::parse(Request::input('filter'), $this->getValidFilters());
}
if(is_null($filter)) $filter = new Filter();
@ -96,9 +96,9 @@ abstract class RetrieveSummitEventsStrategy
*/
protected function buildOrder(){
$order = null;
if (Input::has('order'))
if (Request::has('order'))
{
$order = OrderParser::parse(Input::get('order'), [
$order = OrderParser::parse(Request::input('order'), [
'title',
'start_date',

3
app/Http/Controllers/Apis/Protected/Summit/Traits/AddEntity.php
View File

@ -12,7 +12,6 @@
* limitations under the License.
**/
use App\Http\Exceptions\HTTP403ForbiddenException;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Validator;
@ -47,7 +46,7 @@ trait AddEntity
public function add(){
try {
if(!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$payload = $data->all();
// Creates a Validator instance and validates the data.

3
app/Http/Controllers/Apis/Protected/Summit/Traits/AddSummitChildElement.php
View File

@ -14,7 +14,6 @@
use App\Http\Exceptions\HTTP403ForbiddenException;
use models\summit\Summit;
use models\utils\IEntity;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Validator;
@ -54,7 +53,7 @@ trait AddSummitChildElement
public function add($summit_id){
try {
if(!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$payload = $data->all();
$summit = SummitFinderStrategyFactory::build($this->getSummitRepository(), $this->getResourceServerContext())->find($summit_id);
if (is_null($summit)) return $this->error404();

17
app/Http/Controllers/Apis/Protected/Summit/Traits/GetAll.php
View File

@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
**/
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Validator;
@ -64,7 +63,7 @@ trait GetAll
* @return \Illuminate\Http\JsonResponse|mixed
*/
public function getAll(){
$values = Input::all();
$values = Request::all();
$rules = [
'page' => 'integer|min:1',
@ -84,15 +83,15 @@ trait GetAll
$page = 1;
$per_page = PagingConstants::DefaultPageSize;;
if (Input::has('page')) {
$page = intval(Input::get('page'));
$per_page = intval(Input::get('per_page'));
if (Request::has('page')) {
$page = intval(Request::input('page'));
$per_page = intval(Request::input('per_page'));
}
$filter = null;
if (Input::has('filter')) {
$filter = FilterParser::parse(Input::get('filter'), $this->getFilterRules());
if (Request::has('filter')) {
$filter = FilterParser::parse(Request::input('filter'), $this->getFilterRules());
}
if(is_null($filter)) $filter = new Filter();
@ -104,9 +103,9 @@ trait GetAll
$order = null;
if (Input::has('order'))
if (Request::has('order'))
{
$order = OrderParser::parse(Input::get('order'), $this->getOrderRules());
$order = OrderParser::parse(Request::input('order'), $this->getOrderRules());
}
$data = $this->getRepository()->getAllByPage(new PagingInfo($page, $per_page), $this->applyExtraFilters($filter), $order);

3
app/Http/Controllers/Apis/Protected/Summit/Traits/GetAndValidateJsonPayload.php
View File

@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
**/
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Validator;
use models\exceptions\ValidationException;
@ -30,7 +29,7 @@ trait GetAndValidateJsonPayload
if(!Request::isJson()){
throw new \InvalidArgumentException("invalid request format");
}
$data = Input::json();
$data = Request::json();
$payload = $data->all();
// Creates a Validator instance and validates the data.
$validation = Validator::make($payload, $validation_rules);

2
app/Http/Controllers/Apis/Protected/Summit/Traits/GetSummitChildElementById.php
View File

@ -53,7 +53,7 @@ trait GetSummitChildElementById
$child = $this->getChildFromSummit($summit, $child_id);
if(is_null($child))
return $this->error404();
return $this->ok(SerializerRegistry::getInstance()->getSerializer($child, $this->getChildSerializer())->serialize( Request::input('expand', '')));
return $this->ok(SerializerRegistry::getInstance()->getSerializer($child, $this->getChildSerializer())->serialize(Request::input('expand', '')));
} catch (ValidationException $ex1) {
Log::warning($ex1);
return $this->error412($ex1->getMessages());

3
app/Http/Controllers/Apis/Protected/Summit/Traits/ParametrizedAddEntity.php
View File

@ -12,7 +12,6 @@
* limitations under the License.
**/
use App\Http\Exceptions\HTTP403ForbiddenException;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Validator;
@ -36,7 +35,7 @@ trait ParametrizedAddEntity
){
try {
if(!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$payload = $data->all();
// Creates a Validator instance and validates the data.

1
app/Http/Controllers/Apis/Protected/Summit/Traits/ParametrizedGetAll.php
View File

@ -26,7 +26,6 @@ use utils\OrderParser;
use utils\PagingInfo;
use App\Http\Utils\PagingConstants;
use Exception;
/**
* Trait ParametrizedGetAll
* @package App\Http\Controllers

3
app/Http/Controllers/Apis/Protected/Summit/Traits/ParametrizedUpdateEntity.php
View File

@ -12,7 +12,6 @@
* limitations under the License.
**/
use App\Http\Exceptions\HTTP403ForbiddenException;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Validator;
@ -41,7 +40,7 @@ trait ParametrizedUpdateEntity
...$args){
try {
if(!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$payload = $data->all();
// Creates a Validator instance and validates the data.

56
app/Http/Controllers/Apis/Protected/Summit/Traits/SummitBookableVenueRoomApi.php
View File

@ -12,11 +12,9 @@
* limitations under the License.
**/
use App\Http\Utils\BooleanCellFormatter;
use App\Http\Utils\EpochCellFormatter;
use App\Http\Utils\PagingConstants;
use Exception;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Validator;
@ -28,12 +26,10 @@ use models\summit\SummitRoomReservation;
use models\summit\SummitVenue;
use ModelSerializers\SerializerRegistry;
use utils\Filter;
use utils\FilterElement;
use utils\FilterParser;
use utils\OrderParser;
use utils\PagingInfo;
use utils\PagingResponse;
use Illuminate\Http\Request as LaravelRequest;
/**
* Trait SummitBookableVenueRoomApi
* @package App\Http\Controllers
@ -80,7 +76,7 @@ trait SummitBookableVenueRoomApi
* @return \Illuminate\Http\JsonResponse|mixed
*/
public function getBookableVenueRooms($summit_id){
$values = Input::all();
$values = Request::all();
$rules = [
'page' => 'integer|min:1',
'per_page' => sprintf('required_with:page|integer|min:%s|max:%s', PagingConstants::MinPageSize, PagingConstants::MaxPageSize),
@ -102,15 +98,15 @@ trait SummitBookableVenueRoomApi
$page = 1;
$per_page = PagingConstants::DefaultPageSize;
if (Input::has('page')) {
$page = intval(Input::get('page'));
$per_page = intval(Input::get('per_page'));
if (Request::has('page')) {
$page = intval(Request::input('page'));
$per_page = intval(Request::input('per_page'));
}
$filter = null;
if (Input::has('filter')) {
$filter = FilterParser::parse(Input::get('filter'), [
if (Request::has('filter')) {
$filter = FilterParser::parse(Request::input('filter'), [
'name' => ['==', '=@'],
'description' => ['=@'],
'capacity' => ['>', '<', '<=', '>=', '=='],
@ -130,9 +126,9 @@ trait SummitBookableVenueRoomApi
$order = null;
if (Input::has('order'))
if (Request::has('order'))
{
$order = OrderParser::parse(Input::get('order'), [
$order = OrderParser::parse(Request::input('order'), [
'id',
'name',
'capacity',
@ -180,7 +176,7 @@ trait SummitBookableVenueRoomApi
* @return mixed
*/
public function getAllReservationsBySummit($summit_id){
$values = Input::all();
$values = Request::all();
$rules = [
'page' => 'integer|min:1',
@ -203,15 +199,15 @@ trait SummitBookableVenueRoomApi
$page = 1;
$per_page = PagingConstants::DefaultPageSize;
if (Input::has('page')) {
$page = intval(Input::get('page'));
$per_page = intval(Input::get('per_page'));
if (Request::has('page')) {
$page = intval(Request::input('page'));
$per_page = intval(Request::input('per_page'));
}
$filter = null;
if (Input::has('filter')) {
$filter = FilterParser::parse(Input::get('filter'), [
if (Request::has('filter')) {
$filter = FilterParser::parse(Request::input('filter'), [
'summit_id' => ['=='],
'room_name' => ['==', '=@'],
'room_id' => ['=='],
@ -246,9 +242,9 @@ trait SummitBookableVenueRoomApi
$order = null;
if (Input::has('order'))
if (Request::has('order'))
{
$order = OrderParser::parse(Input::get('order'), [
$order = OrderParser::parse(Request::input('order'), [
'id',
'start_datetime',
'end_datetime',
@ -311,8 +307,8 @@ trait SummitBookableVenueRoomApi
$filter = null;
if (Input::has('filter')) {
$filter = FilterParser::parse(Input::get('filter'), [
if (Request::has('filter')) {
$filter = FilterParser::parse(Request::input('filter'), [
'summit_id' => ['=='],
'room_name' => ['==', '=@'],
'room_id' => ['=='],
@ -347,9 +343,9 @@ trait SummitBookableVenueRoomApi
$order = null;
if (Input::has('order'))
if (Request::has('order'))
{
$order = OrderParser::parse(Input::get('order'), [
$order = OrderParser::parse(Request::input('order'), [
'id',
'start_datetime',
'end_datetime',
@ -574,7 +570,7 @@ trait SummitBookableVenueRoomApi
if(!$room instanceof SummitBookableVenueRoom)
return $this->error404();
$payload = Input::json()->all();
$payload = Request::json()->all();
$payload['owner_id'] = $current_member->getId();
$rules = SummitRoomReservationValidationRulesFactory::build($payload);
// Creates a Validator instance and validates the data.
@ -716,7 +712,7 @@ trait SummitBookableVenueRoomApi
public function updateVenueBookableRoom($summit_id, $venue_id, $room_id){
try {
if(!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$summit = SummitFinderStrategyFactory::build($this->repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
$payload['class_name'] = SummitBookableVenueRoom::ClassName;
@ -811,7 +807,7 @@ trait SummitBookableVenueRoomApi
public function updateVenueFloorBookableRoom($summit_id, $venue_id, $floor_id, $room_id){
try {
if(!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$summit = SummitFinderStrategyFactory::build($this->repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
$payload['class_name'] = SummitBookableVenueRoom::ClassName;
@ -883,7 +879,7 @@ trait SummitBookableVenueRoomApi
public function addVenueBookableRoom($summit_id, $venue_id){
try {
if(!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$summit = SummitFinderStrategyFactory::build($this->repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
$payload['class_name'] = SummitBookableVenueRoom::ClassName;
@ -927,7 +923,7 @@ trait SummitBookableVenueRoomApi
public function addVenueFloorBookableRoom($summit_id, $venue_id, $floor_id){
try {
if(!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$summit = SummitFinderStrategyFactory::build($this->repository, $this->resource_server_context)->find($summit_id);
if (is_null($summit)) return $this->error404();
$payload['class_name'] = SummitBookableVenueRoom::ClassName;
@ -1031,7 +1027,7 @@ trait SummitBookableVenueRoomApi
public function refundBookableVenueRoomReservation($summit_id, $room_id, $reservation_id){
try {
if(!Request::isJson()) return $this->error400();
$payload = Input::json()->all();
$payload = Request::json()->all();
$rules = [
'amount' => 'required|integer|greater_than:0',
];

3
app/Http/Controllers/Apis/Protected/Summit/Traits/UpdateEntity.php
View File

@ -13,7 +13,6 @@
**/
use App\Http\Exceptions\HTTP403ForbiddenException;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Validator;
@ -50,7 +49,7 @@ trait UpdateEntity
public function update($id){
try {
if(!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$payload = $data->all();
// Creates a Validator instance and validates the data.

3
app/Http/Controllers/Apis/Protected/Summit/Traits/UpdateSummitChildElement.php
View File

@ -13,7 +13,6 @@
**/
use models\summit\Summit;
use models\utils\IEntity;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Validator;
@ -55,7 +54,7 @@ trait UpdateSummitChildElement
public function update($summit_id, $child_id){
try {
if(!Request::isJson()) return $this->error400();
$data = Input::json();
$data = Request::json();
$summit = SummitFinderStrategyFactory::build($this->getSummitRepository(), $this->getResourceServerContext())->find($summit_id);
if (is_null($summit)) return $this->error404();

4
app/Http/Controllers/Apis/TimezonesApiController.php
View File

@ -12,7 +12,7 @@
* limitations under the License.
**/
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Log;
use models\exceptions\EntityNotFoundException;
use models\exceptions\ValidationException;
@ -38,7 +38,7 @@ final class TimezonesApiController extends JsonController
$timezones
);
return $this->ok($response->toArray($expand = Input::get('expand','')));
return $this->ok($response->toArray($expand = Request::input('expand','')));
}
catch (ValidationException $ex1) {
Log::warning($ex1);

1
app/Http/Controllers/ConfigurationsController.php
View File

@ -12,7 +12,6 @@
* limitations under the License.
**/
use App\Models\ResourceServer\IApiRepository;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Route;

18
app/Http/Controllers/JsonController.php
View File

@ -13,9 +13,9 @@
**/
use App\Http\Utils\CSVExporter;
use Exception;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Response;
use Illuminate\Support\Facades\Request;
/**
* Class JsonController
* @package App\Http\Controllers
@ -39,8 +39,8 @@ abstract class JsonController extends Controller
{
$res = Response::json($data, 201);
//jsonp
if (Input::has('callback')) {
$res->setCallback(Input::get('callback'));
if (Request::has('callback')) {
$res->setCallback(Request::input('callback'));
}
return $res;
@ -50,8 +50,8 @@ abstract class JsonController extends Controller
{
$res = Response::json($data, 204);
//jsonp
if (Input::has('callback')) {
$res->setCallback(Input::get('callback'));
if (Request::has('callback')) {
$res->setCallback(Request::input('callback'));
}
return $res;
@ -61,8 +61,8 @@ abstract class JsonController extends Controller
{
$res = Response::json($data, $has_content ? 201 : 204);
//jsonp
if (Input::has('callback')) {
$res->setCallback(Input::get('callback'));
if (Request::has('callback')) {
$res->setCallback(Request::input('callback'));
}
return $res;
}
@ -77,8 +77,8 @@ abstract class JsonController extends Controller
$res = $this->response2XX(200, $data);
//jsonp
if (Input::has('callback')) {
$res->setCallback(Input::get('callback'));
if (Request::has('callback')) {
$res->setCallback(Request::input('callback'));
}
return $res;

32
app/Http/Kernel.php
View File

@ -14,12 +14,12 @@ class Kernel extends HttpKernel
* @var array
*/
protected $middleware = [
\Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
\App\Http\Middleware\EncryptCookies::class,
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
\Illuminate\Session\Middleware\StartSession::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
\Spatie\Cors\Cors::class,
//\App\Http\Middleware\TrustProxies::class,
\App\Http\Middleware\CheckForMaintenanceMode::class,
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
\App\Http\Middleware\TrimStrings::class,
//\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
\Fruitcake\Cors\HandleCors::class,
\App\Http\Middleware\SecurityHTTPHeadersWriterMiddleware::class,
\App\Http\Middleware\ParseMultipartFormDataInputForNonPostRequests::class,
\App\Http\Middleware\DoctrineMiddleware::class,
@ -32,9 +32,29 @@ class Kernel extends HttpKernel
*/
protected $middlewareGroups = [
'web' => [
\App\Http\Middleware\EncryptCookies::class,
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
\Illuminate\Session\Middleware\StartSession::class,
// \Illuminate\Session\Middleware\AuthenticateSession::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
\App\Http\Middleware\VerifyCsrfToken::class,
\Illuminate\Routing\Middleware\SubstituteBindings::class,
],
'api' => [
'ssl',
'oauth2.protected',
'rate.limit',
'etags'
],
'public_api' => [
'ssl',
'rate.limit:10000,1', // 10000 request per minute
'etags'
],
'well_known' => [
'ssl',
'rate.limit:1000,1', // 1000 request per minute
]
];
/**

25
app/Http/Middleware/Authenticate.php
View File

@ -2,29 +2,20 @@
namespace App\Http\Middleware;
use Closure;
use Illuminate\Support\Facades\Auth;
use Illuminate\Auth\Middleware\Authenticate as Middleware;
class Authenticate
class Authenticate extends Middleware
{
/**
* Handle an incoming request.
* Get the path the user should be redirected to when they are not authenticated.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param string|null $guard
* @return mixed
* @return string|null
*/
public function handle($request, Closure $next, $guard = null)
protected function redirectTo($request)
{
if (Auth::guard($guard)->guest()) {
if ($request->ajax() || $request->wantsJson()) {
return response('Unauthorized.', 401);
} else {
return redirect()->guest('login');
}
if (! $request->expectsJson()) {
return route('login');
}
return $next($request);
}
}
}

531
app/Http/Middleware/CORSMiddleware.php
View File

@ -1,531 +0,0 @@
<?php namespace App\Http\Middleware;
/**
* Copyright 2015 OpenStack Foundation
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
**/
use Closure;
use Illuminate\Support\Facades\Log;
use libs\utils\ICacheService;
use App\Models\ResourceServer\IApiEndpoint;
use App\Models\ResourceServer\IApiEndpointRepository;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Illuminate\Support\Facades\Cache;
use Carbon\Carbon;
use Illuminate\Support\Facades\Config;
use libs\utils\RequestUtils;
/**
*
* @package App\Http\Middleware\
* Implementation of http://www.w3.org/TR/cors/
*/
class CORSMiddleware
{
const CORS_IP_BLACKLIST_PREFIX = 'CORS_IP_BLACKLIST_PREFIX:';
private $headers = [];
/**
* A header is said to be a simple header if the header field name is an ASCII case-insensitive match for Accept,
* Accept-Language, or Content-Language or if it is an ASCII case-insensitive match for Content-Type and the header
* field value media type (excluding parameters) is an ASCII case-insensitive match for
* application/x-www-form-urlencoded, multipart/form-data, or text/plain.
*/
protected static $simple_headers = [
'accept',
'accept-language',
'content-language',
'origin',
];
protected static $simple_content_header_values = [
'application/x-www-form-urlencode',
'multipart/form-data',
'text/plain'
];
/**
* A method is said to be a simple method if it is a case-sensitive match for one of the following:
* - GET
* - HEAD
* - POST
*/
protected static $simple_http_methods = array('GET', 'HEAD', 'POST');
const DefaultAllowedHeaders = 'origin, content-type, accept, authorization, x-requested-with';
const DefaultAllowedMethods = 'GET, POST, OPTIONS, PUT, DELETE';
/**
* @var
*/
private $redis;
/**
* @var IApiEndpointRepository
*/
private $endpoint_repository;
/**
* @var IApiEndpoint;
*/
private $current_endpoint = null;
private $allowed_headers;
private $allowed_methods;
/**
* @var ICacheService
*/
private $cache_service;
/**
* CORSMiddleware constructor.
* @param IApiEndpointRepository $endpoint_repository
* @param ICacheService $cache_service
*/
public function __construct(IApiEndpointRepository $endpoint_repository, ICacheService $cache_service)
{
$this->endpoint_repository = $endpoint_repository;
$this->cache_service = $cache_service;
$this->allowed_headers = Config::get('cors.allowed_headers', self::DefaultAllowedHeaders);
$this->allowed_methods = Config::get('cors.allowed_methods', self::DefaultAllowedMethods);
}
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @return mixed
*/
public function handle($request, Closure $next)
{
if ($response = $this->preProcess($request))
{
return $response;
}
//normal processing
$response = $next($request);
$this->postProcess($request, $response);
return $response;
}
private function generatePreflightCacheKey($request)
{
$cache_id = 'pre-flight-'. $request->getClientIp(). '-' . $request->getRequestUri(). '-' . $request->getMethod();
if($request->headers->has('Origin')){
$origin = $request->headers->get('Origin');
$cache_id .= "-".$origin;
}
return $cache_id;
}
/**
* @param Request $request
* @return Response
*/
public function preProcess(Request $request)
{
$actual_request = false;
Log::debug(sprintf("CORSMiddleware::preProcess ip %s uri %s method %s", $request->getClientIp(), $request->getRequestUri(), $request->getMethod()));
if ($this->isValidCORSRequest($request))
{
Log::debug(sprintf("CORSMiddleware::preProcess isValidCORSRequest true"));
/* Step 01 : Determine the type of the incoming request */
$type = $this->getRequestType($request);
/* Step 02 : Process request according to is type */
Log::debug(sprintf("CORSMiddleware::preProcess getRequestType %s", $type));
switch($type)
{
case CORSRequestPreflightType::REQUEST_FOR_PREFLIGHT:
{
// HTTP request send by client to preflight a further 'Complex' request
// sets the original method on request in order to be able to find the
// correct route
$real_method = $request->headers->get('Access-Control-Request-Method');
$request->setMethod($real_method);
$route_path = RequestUtils::getCurrentRoutePath($request);
if (!$route_path || !$this->checkEndPoint($route_path, $real_method))
{
Log::debug(sprintf("CORSMiddleware::preProcess checkEndPoint path %s real method %s returning 403", $route_path, $real_method));
$response = new Response();
$response->setStatusCode(403);
return $response;
}
// ----Step 2b: Store pre-flight request data in the Cache to keep (mark) the request as correctly followed the request pre-flight process
$data = new CORSRequestPreflightData($request, is_null($this->current_endpoint)? false : $this->current_endpoint->isAllowCredentials());
$cache_id = $this->generatePreflightCacheKey($request);
$this->cache_service->storeHash($cache_id, $data->toArray(), CORSRequestPreflightData::$cache_lifetime);
// ----Step 2c: Return corresponding response - This part should be customized with application specific constraints.....
return $this->makePreflightResponse($request);
}
break;
case CORSRequestPreflightType::COMPLEX_REQUEST:
{
$cache_id = $this->generatePreflightCacheKey($request);
// ----Step 2a: Check if the current request has an entry into the preflighted requests Cache
$data = $this->cache_service->getHash($cache_id, CORSRequestPreflightData::$cache_attributes);
if (!count($data))
{
// there wasnt preflight so just regular processing
return null;
}
// ----Step 2b: Check that pre-flight information declared during the pre-flight request match the current request on key information
$match = false;
// ------Start with comparison of "Origin" HTTP header (according to utility method impl. used to retrieve header reference cannot be null)...
if ($request->headers->get('Origin') === $data['origin'])
{
// ------Continue with HTTP method...
if ($request->getMethod() === $data['expected_method'])
{
// ------Finish with custom HTTP headers (use an method to avoid manual iteration on collection to increase the speed)...
$x_headers = self::getCustomHeaders($request);
$x_headers_pre = explode(',', $data['expected_custom_headers']);
sort($x_headers);
sort($x_headers_pre);
if (count(array_diff($x_headers, $x_headers_pre)) === 0)
{
$match = true;
}
}
}
if (!$match)
{
Log::debug(sprintf("CORSMiddleware::preProcess checkEndPoint match false returning 403"));
$response = new Response();
$response->setStatusCode(403);
return $response;
}
$actual_request = true;
}
break;
case CORSRequestPreflightType::SIMPLE_REQUEST:
{
// origins, do not set any additional headers and terminate this set of steps.
if (!$this->isAllowedOrigin($request)) {
Log::debug(sprintf("CORSMiddleware::preProcess isAllowedOrigin false returning 403"));
$response = new Response();
$response->setStatusCode(403);
return $response;
}
$actual_request = true;
// If the resource supports credentials add a single Access-Control-Allow-Origin header, with the value
// of the Origin header as value, and add a single Access-Control-Allow-Credentials header with the
// case-sensitive string "true" as value.
// Otherwise, add a single Access-Control-Allow-Origin header, with either the value of the Origin header
// or the string "*" as value.
}
break;
}
}
if ($actual_request)
{
Log::debug(sprintf("CORSMiddleware::preProcess actual_request is true"));
// Save response headers
$cache_id = $this->generatePreflightCacheKey($request);
// ----Step 2a: Check if the current request has an entry into the preflighted requests Cache
$data = $this->cache_service->getHash($cache_id, CORSRequestPreflightData::$cache_attributes);
$this->headers['Access-Control-Allow-Origin'] = $request->headers->get('Origin');
if (isset($data['allows_credentials']) && $data['allows_credentials'] == true)
{
$this->headers['Access-Control-Allow-Credentials'] = 'true';
}
/**
* During a CORS request, the getResponseHeader() method can only access simple response headers.
* Simple response headers are defined as follows:
** Cache-Control
** Content-Language
** Content-Type
** Expires
** Last-Modified
** Pragma
* If you want clients to be able to access other headers,
* you have to use the Access-Control-Expose-Headers header.
* The value of this header is a comma-delimited list of response headers you want to expose
* to the client.
*/
$exposed_headers = Config::get('cors.exposed_headers', 'Content-Type, Expires');
if (!empty($exposed_headers))
{
$this->headers['Access-Control-Expose-Headers'] = $exposed_headers ;
}
}
}
public function postProcess(Request $request, Response $response)
{
// add CORS response headers
if (count($this->headers) > 0)
{
$response->headers->add($this->headers);
}
return $response;
}
/**
* @param Request $request
* @return Response
*/
private function makePreflightResponse(Request $request)
{
$response = new Response();
if (!$this->isAllowedOrigin($request))
{
Log::debug(sprintf("CORSMiddleware::makePreflightResponse isAllowedOrigin is false returning 403"));
$response->headers->set('Access-Control-Allow-Origin', 'null');
$response->setStatusCode(403);
return $response;
}
$response->headers->set('Access-Control-Allow-Origin', $request->headers->get('Origin'));
// The Access-Control-Request-Method header indicates which method will be used in the actual
// request as part of the preflight request
// check request method
if (!is_null($this->current_endpoint) && $request->headers->get('Access-Control-Request-Method') != $this->current_endpoint->getHttpMethod())
{
Log::debug(sprintf("CORSMiddleware::makePreflightResponse returning 405"));
$response->setStatusCode(405);
return $response;
}
// The Access-Control-Allow-Credentials header indicates whether the response to request
// can be exposed when the omit credentials flag is unset. When part of the response to a preflight request
// it indicates that the actual request can include user credentials.
if (!is_null($this->current_endpoint) && $this->current_endpoint->isAllowCredentials())
{
$response->headers->set('Access-Control-Allow-Credentials', 'true');
}
if (Config::get('cors.use_pre_flight_caching', false))
{
// The Access-Control-Max-Age header indicates how long the response can be cached, so that for
// subsequent requests, within the specified time, no preflight request has to be made.
$response->headers->set('Access-Control-Max-Age', Config::get('cors.max_age', 32000));
}
// The Access-Control-Allow-Headers header indicates, as part of the response to a preflight request,
// which header field names can be used during the actual request
$response->headers->set('Access-Control-Allow-Headers', $this->allowed_headers);
//The Access-Control-Allow-Methods header indicates, as part of the response to a preflight request,
// which methods can be used during the actual request.
$response->headers->set('Access-Control-Allow-Methods', $this->allowed_methods);
// The Access-Control-Request-Headers header indicates which headers will be used in the actual request
// as part of the preflight request.
$headers = $request->headers->get('Access-Control-Request-Headers');
if ($headers)
{
$headers = trim(strtolower($headers));
$allow_headers = explode(', ', $this->allowed_headers);
foreach (preg_split('{, *}', $headers) as $header)
{
//if they are simple headers then skip them
if (in_array($header, self::$simple_headers, true))
{
continue;
}
//check is the requested header is on the list of allowed headers
if (!in_array($header, $allow_headers, true))
{
Log::debug(sprintf("CORSMiddleware::makePreflightResponse header %s is not on allowed headers returning 400", $header));
$response->setStatusCode(400);
$response->setContent('Unauthorized header '.$header);
break;
}
}
}
//OK - No Content
$response->setStatusCode(204);
return $response;
}
/**
* @param Request $request
* @returns bool
*/
private function isValidCORSRequest(Request $request)
{
/**
* The presence of the Origin header does not necessarily mean that the request is a cross-origin request.
* While all cross-origin requests will contain an Origin header,
* Origin header on same-origin requests. But Chrome and Safari include an Origin header on
* same-origin POST/PUT/DELETE requests (same-origin GET requests will not have an Origin header).
*/
return $request->headers->has('Origin');
}
/**
* https://www.owasp.org/index.php/CORS_OriginHeaderScrutiny
* Filter that will ensure the following points for each incoming HTTP CORS requests:
* - Have only one and non empty instance of the origin header,
* - Have only one and non empty instance of the host header,
* - The value of the origin header is present in a internal allowed domains list (white list). As we act before the
* step 2 of the CORS HTTP requests/responses exchange process, allowed domains list is yet provided to client,
* - Cache IP of the sender for 1 hour. If the sender send one time a origin domain that is not in the white list
* then all is requests will return an HTTP 403 response (protract allowed domain guessing).
* We use the method above because it's not possible to identify up to 100% that the request come from one expected
* client application, since:
* - All information of a HTTP request can be faked,
* - It's the browser (or others tools) that send the HTTP request then the IP address that we have access to is the
* client IP address.
* @param Request $request
* @return bool
*/
private function testOriginHeaderScrutiny(Request $request)
{
/* Step 0 : Check presence of client IP in black list */
$client_ip = $request->getClientIp();
if (Cache::has(self::CORS_IP_BLACKLIST_PREFIX . $client_ip))
{
Log::debug(sprintf("CORSMiddleware::testOriginHeaderScrutiny ip %s is blacklisted", $client_ip));
return false;
}
/* Step 1 : Check that we have only one and non empty instance of the "Origin" header */
$origin = $request->headers->get('Origin', null, false);
if (is_array($origin) && count($origin) > 1)
{
// If we reach this point it means that we have multiple instance of the "Origin" header
// Add client IP address to black listed client
$expiresAt = Carbon::now()->addMinutes(60);
Cache::put(self::CORS_IP_BLACKLIST_PREFIX . $client_ip, self::CORS_IP_BLACKLIST_PREFIX . $client_ip, $expiresAt);
Log::debug(sprintf("CORSMiddleware::testOriginHeaderScrutiny ip %s is blacklisted", $client_ip));
return false;
}
/* Step 2 : Check that we have only one and non empty instance of the "Host" header */
$host = $request->headers->get('Host', null, false);
//Have only one and non empty instance of the host header,
if (is_array($host) && count($host) > 1)
{
// If we reach this point it means that we have multiple instance of the "Host" header
$expiresAt = Carbon::now()->addMinutes(60);
Cache::put(self::CORS_IP_BLACKLIST_PREFIX . $client_ip, self::CORS_IP_BLACKLIST_PREFIX . $client_ip, $expiresAt);
Log::debug(sprintf("CORSMiddleware::testOriginHeaderScrutiny ip %s is blacklisted", $client_ip));
return false;
}
/* Step 3 : Perform analysis - Origin header is required */
$origin = $request->headers->get('Origin');
$host = $request->headers->get('Host');
$server_name = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : null;
$origin_host = @parse_url($origin, PHP_URL_HOST);
// check origin not empty and allowed
if (!$this->isAllowedOrigin($origin))
{
$expiresAt = Carbon::now()->addMinutes(60);
Cache::put(self::CORS_IP_BLACKLIST_PREFIX . $client_ip, self::CORS_IP_BLACKLIST_PREFIX . $client_ip, $expiresAt);
Log::debug(sprintf("CORSMiddleware::testOriginHeaderScrutiny ip %s is blacklisted", $client_ip));
return false;
}
if (is_null($host) || $server_name != $host || is_null($origin_host) || $origin_host == $server_name)
{
$expiresAt = Carbon::now()->addMinutes(60);
Cache::put(self::CORS_IP_BLACKLIST_PREFIX . $client_ip, self::CORS_IP_BLACKLIST_PREFIX . $client_ip, $expiresAt);
Log::debug(sprintf("CORSMiddleware::testOriginHeaderScrutiny ip %s is blacklisted", $client_ip));
return false;
}
/* Step 4 : Finalize request next step */
return true;
}
/**
* @param $endpoint_path
* @param $http_method
* @return bool
*/
private function checkEndPoint($endpoint_path, $http_method)
{
$this->current_endpoint = $this->endpoint_repository->getApiEndpointByUrlAndMethod($endpoint_path, $http_method);
if (is_null($this->current_endpoint))
{
return true;
}
if (!$this->current_endpoint->isAllowCors() || !$this->current_endpoint->isActive())
{
return false;
}
return true;
}
/**
* @param string $origin
* @return bool
*/
private function isAllowedOrigin($origin)
{
return true;
}
private static function getRequestType(Request $request)
{
$type = CORSRequestPreflightType::UNKNOWN;
$http_method = $request->getMethod();
$content_type = $request->headers->has('Content-Type') ? strtolower( $request->headers->get('Content-Type')) : null;
if (false !== $pos = strpos($content_type, ';')) {
$content_type = substr($content_type, 0, $pos);
}
$http_method = strtoupper($http_method);
if ($http_method === 'OPTIONS' && $request->headers->has('Access-Control-Request-Method'))
{
$type = CORSRequestPreflightType::REQUEST_FOR_PREFLIGHT;
}
else
{
if (self::hasCustomHeaders($request))
{
$type = CORSRequestPreflightType::COMPLEX_REQUEST;
}
elseif ($http_method === 'POST' && !in_array($content_type, self::$simple_content_header_values, true))
{
$type = CORSRequestPreflightType::COMPLEX_REQUEST;
}
elseif (!in_array($http_method, self::$simple_http_methods, true))
{
$type = CORSRequestPreflightType::COMPLEX_REQUEST;
}
else
{
$type = CORSRequestPreflightType::SIMPLE_REQUEST;
}
}
return $type;
}
private static function getCustomHeaders(Request $request)
{
$custom_headers = array();
foreach ($request->headers->all() as $k => $h)
{
if (starts_with('X-', strtoupper(trim($k))))
{
array_push($custom_headers, strtoupper(trim($k)));
}
}
return $custom_headers;
}
private static function hasCustomHeaders(Request $request)
{
return count(self::getCustomHeaders($request)) > 0;
}
}

82
app/Http/Middleware/CORSRequestPreflightData.php
View File

@ -1,82 +0,0 @@
<?php namespace App\Http\Middleware;
/**
* Copyright 2015 OpenStack Foundation
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
**/
use Symfony\Component\HttpFoundation\Request;
/**
* Class CORSRequestPreflightData
* @package App\Http\Middleware
*/
class CORSRequestPreflightData
{
// ttl on seconds
public static $cache_lifetime = 10;
public static $cache_attributes = ['sender', 'uri', 'origin', 'expected_method', 'expected_custom_headers', 'allows_credentials'];
/** Final HTTP request expected method */
private $expected_method = null;
/** Final HTTP request expected custom headers */
private $expected_custom_headers = array();
/** Current HTTP request uri */
private $uri = null;
/** Current HTTP request origin header */
private $origin = null;
/** Current Sender IP address */
private $sender = null;
/**
* @var bool
*/
private $allows_credentials;
/**
* @param Request $request
* @param bool $allows_credentials
*/
public function __construct(Request $request, $allows_credentials)
{
$this->sender = $request->getClientIp();
$this->uri = $request->getRequestUri();
$this->origin = $request->headers->get('Origin');
$this->expected_method = $request->headers->get('Access-Control-Request-Method');
$this->allows_credentials = $allows_credentials;
$tmp = $request->headers->get("Access-Control-Request-Headers");
if (!empty($tmp))
{
$hs = explode(',', $tmp);
foreach ($hs as $h)
{
array_push($this->expected_custom_headers, strtoupper(trim($h)));
}
}
}
/**
* @return array
*/
public function toArray()
{
$res = [];
$res['sender'] = $this->sender;
$res['uri'] = $this->uri;
$res['origin'] = $this->origin;
$res['allows_credentials'] = $this->allows_credentials;
$res['expected_method'] = $this->expected_method;
$res['expected_custom_headers'] = implode(',', $this->expected_custom_headers);
return $res;
}
}

36
app/Http/Middleware/CORSRequestPreflightType.php
View File

@ -1,36 +0,0 @@
<?php namespace App\Http\Middleware;
/**
* Copyright 2015 OpenStack Foundation
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
**/
/**
* Class CORSRequestPreflightType
* @package App\Http\Middleware
*/
final class CORSRequestPreflightType
{
/** HTTP request send by client to preflight a further 'Complex' request */
const REQUEST_FOR_PREFLIGHT = 0;
/** Normal HTTP request send by client that require preflight ie 'Complex' resquest in Preflight process */
const COMPLEX_REQUEST = 1;
/** Normal HTTP request send by client that do not require preflight ie 'Simple' resquest in Preflight process */
const SIMPLE_REQUEST = 2;
/** Cannot determine request type */
const UNKNOWN = -1;
}

17
app/Http/Middleware/CheckForMaintenanceMode.php Normal file
View File

@ -0,0 +1,17 @@
<?php
namespace App\Http\Middleware;
use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode as Middleware;
class CheckForMaintenanceMode extends Middleware
{
/**
* The URIs that should be reachable while maintenance mode is enabled.
*
* @var array
*/
protected $except = [
//
];
}

55
app/Http/Middleware/EncryptCookies.php
View File

@ -1,24 +1,9 @@
<?php namespace App\Http\Middleware;
/**
* Copyright 2015 OpenStack Foundation
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
**/
use Illuminate\Contracts\Encryption\DecryptException;
<?php
namespace App\Http\Middleware;
use Illuminate\Cookie\Middleware\EncryptCookies as Middleware;
use OAuth2\Services\IPrincipalService;
use Symfony\Component\HttpFoundation\Request;
/**
* Class EncryptCookies
* @package App\Http\Middleware
*/
class EncryptCookies extends Middleware
{
/**
@ -27,32 +12,6 @@ class EncryptCookies extends Middleware
* @var array
*/
protected $except = [
//
];
/**
* Decrypt the cookies on the request.
*
* @param \Symfony\Component\HttpFoundation\Request $request
* @return \Symfony\Component\HttpFoundation\Request
*/
protected function decrypt(Request $request)
{
foreach ($request->cookies as $key => $cookie) {
if ($this->isDisabled($key)) {
continue;
}
try {
$request->cookies->set($key, $this->decryptCookie($key, $cookie));
} catch (DecryptException $e) {
$request->cookies->set($key, null);
}
catch(\ErrorException $e1){
$request->cookies->set($key, null);
}
}
return $request;
}
}
}

37
app/Http/Middleware/RateLimitMiddleware.php
View File

@ -54,13 +54,18 @@ final class RateLimitMiddleware extends ThrottleRequests
}
/**
* @param \Illuminate\Http\Request $request
* @param Closure $next
* @param int $max_attempts
* @param int $decay_minutes
* @return \Illuminate\Http\Response|mixed
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param int|string $maxAttempts
* @param float|int $decayMinutes
* @param string $prefix
* @return \Symfony\Component\HttpFoundation\Response
*
* @throws \Illuminate\Http\Exceptions\ThrottleRequestsException
*/
public function handle($request, Closure $next, $max_attempts = 0, $decay_minutes = 0)
public function handle($request, Closure $next, $maxAttempts = 60, $decayMinutes = 1, $prefix = '')
{
$route = RequestUtils::getCurrentRoutePath($request);
$method = $request->getMethod();
@ -69,11 +74,11 @@ final class RateLimitMiddleware extends ThrottleRequests
$client_ip = $request->getClientIp();
if (!is_null($endpoint) && $endpoint->getRateLimit() > 0) {
$max_attempts = $endpoint->getRateLimit();
$maxAttempts = $endpoint->getRateLimit();
}
if (!is_null($endpoint) && $endpoint->getRateLimitDecay() > 0) {
$decay_minutes = $endpoint->getRateLimitDecay();
$decayMinutes = $endpoint->getRateLimitDecay();
}
$endpoint_rate_limit_by_ip = $this->endpoint_rate_limit_by_ip_repository->getByIPRouteMethod
@ -84,26 +89,26 @@ final class RateLimitMiddleware extends ThrottleRequests
);
if(!is_null($endpoint_rate_limit_by_ip)){
$max_attempts = $endpoint_rate_limit_by_ip->getRateLimit();
$decay_minutes = $endpoint_rate_limit_by_ip->getRateLimitDecay();
$maxAttempts = $endpoint_rate_limit_by_ip->getRateLimit();
$decayMinutes = $endpoint_rate_limit_by_ip->getRateLimitDecay();
}
if ($max_attempts == 0 || $decay_minutes == 0) {
if ($maxAttempts == 0 || $decayMinutes == 0) {
// short circuit (infinite)
return $next($request);
}
if ($this->limiter->tooManyAttempts($key, $max_attempts)) {
return $this->buildException($key, $max_attempts);
if ($this->limiter->tooManyAttempts($key, $maxAttempts)) {
throw $this->buildException($key, $maxAttempts);
}
$this->limiter->hit($key, $decay_minutes);
$this->limiter->hit($key, $decayMinutes);
$response = $next($request);
return $this->addHeaders(
$response, $max_attempts,
$this->calculateRemainingAttempts($key, $max_attempts)
$response, $maxAttempts,
$this->calculateRemainingAttempts($key, $maxAttempts)
);
}
}

9
app/Http/Middleware/RedirectIfAuthenticated.php
View File

@ -1,7 +1,8 @@
<?php namespace App\Http\Middleware;
<?php
namespace App\Http\Middleware;
use App\Providers\RouteServiceProvider;
use Closure;
use Illuminate\Support\Facades\Auth;
@ -18,9 +19,9 @@ class RedirectIfAuthenticated
public function handle($request, Closure $next, $guard = null)
{
if (Auth::guard($guard)->check()) {
return redirect('/');
return redirect(RouteServiceProvider::HOME);
}
return $next($request);
}
}
}

2
app/Http/Middleware/TrimStrings.php
View File

@ -15,4 +15,4 @@ class TrimStrings extends Middleware
'password',
'password_confirmation',
];
}
}

6
app/Http/Middleware/TrustProxies.php
View File

@ -2,15 +2,15 @@
namespace App\Http\Middleware;
use Illuminate\Http\Request;
use Fideloper\Proxy\TrustProxies as Middleware;
use Illuminate\Http\Request;
class TrustProxies extends Middleware
{
/**
* The trusted proxies for this application.
*
* @var array
* @var array|string
*/
protected $proxies;
@ -20,4 +20,4 @@ class TrustProxies extends Middleware
* @var int
*/
protected $headers = Request::HEADER_X_FORWARDED_ALL;
}
}

5
app/Http/Middleware/UserAuthEndpoint.php
View File

@ -81,10 +81,13 @@ final class UserAuthEndpoint
Log::debug(sprintf("UserAuthEndpoint::handle route %s method %s member %s (%s) required group %s",
$route, $method, $current_member->getId(), $current_member->getEmail(), $required_group->getSlug()));
if($current_member->isOnGroup($required_group->getSlug()))
if($current_member->isOnGroup($required_group->getSlug())) {
Log::debug(sprintf("UserAuthEndpoint::handle member %s is on group %s request %s", $current_member->getId(), $required_group->getSlug(), $request->path()));
return $next($request);
}
}
Log::warning(sprintf("UserAuthEndpoint::handle member %s is not authorized", $current_member->getId()));
$http_response = Response::json(['error' => 'unauthorized member'], 403);
return $http_response;
}

9
app/Http/Middleware/VerifyCsrfToken.php
View File

@ -6,6 +6,13 @@ use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as Middleware;
class VerifyCsrfToken extends Middleware
{
/**
* Indicates whether the XSRF-TOKEN cookie should be set on the response.
*
* @var bool
*/
protected $addHttpCookie = true;
/**
* The URIs that should be excluded from CSRF verification.
*
@ -14,4 +21,4 @@ class VerifyCsrfToken extends Middleware
protected $except = [
//
];
}
}

BIN
app/Http/Middleware/cors_server_flowchart.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 98 KiB

255
app/Http/Routes/public.php
View File

@ -1,255 +0,0 @@
<?php
/**
* Copyright 2018 OpenStack Foundation
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
**/
use Illuminate\Support\Facades\Config;
use Illuminate\Support\Facades\Route;
// public api ( without AUTHZ [OAUTH2.0])
Route::group([
'namespace' => 'App\Http\Controllers',
'prefix' => 'api/public/v1',
'before' => [],
'after' => [],
'middleware' => [
'ssl',
'rate.limit:10000,1', // 10000 request per minute
'etags'
]
], function () {
Route::group(['prefix' => 'sponsored-projects'], function(){
Route::get('', 'OAuth2SponsoredProjectApiController@getAll');
Route::group(['prefix'=>'{id}'], function(){
Route::get('', [ 'uses' => 'OAuth2SponsoredProjectApiController@get']);
Route::group(['prefix'=>'sponsorship-types'], function(){
Route::get('', 'OAuth2SponsoredProjectApiController@getAllSponsorshipTypes');
Route::group(['prefix'=>'{sponsorship_type_id}'], function(){
Route::get('', [ 'uses' => 'OAuth2SponsoredProjectApiController@getSponsorshipType']);
Route::group(['prefix'=>'supporting-companies'], function(){
Route::get('', [ 'uses' => 'OAuth2SponsoredProjectApiController@getSupportingCompanies']);
});
});
});
});
});
// files
Route::group(['prefix' => 'files'], function () {
Route::post('upload','OAuth2ChunkedFilesApiController@uploadFile' );
});
// members
Route::group(['prefix' => 'members'], function () {
Route::get('', 'OAuth2MembersApiController@getAll');
});
// members
Route::group(['prefix' => 'legal-documents'], function () {
Route::get('{id}', 'OAuth2LegalDocumentsApiController@getById');
});
// speakers
Route::group(['prefix' => 'speakers'], function () {
Route::group(['prefix' => '{speaker_id}'], function () {
Route::group(['prefix' => 'edit-permission'], function () {
Route::group(['prefix' => '{token}'], function () {
Route::get('approve', 'OAuth2SummitSpeakersApiController@approveSpeakerEditPermission');
Route::get('decline', 'OAuth2SummitSpeakersApiController@declineSpeakerEditPermission');
});
});
});
});
// summits
Route::group(['prefix' => 'summits'], function () {
Route::get('', ['middleware' => 'cache:' . Config::get('cache_api_response.get_summit_response_lifetime', 600), 'uses' => 'OAuth2SummitApiController@getSummits']);
Route::group(['prefix' => 'all'], function () {
Route::get('', 'OAuth2SummitApiController@getAllSummits');
Route::get('current', 'OAuth2SummitApiController@getAllCurrentSummit');
Route::get('{id}', 'OAuth2SummitApiController@getAllSummitByIdOrSlug');
Route::group(['prefix' => 'payments'], function () {
Route::group(['prefix' => '{application_name}'], function () {
Route::post('confirm', 'PaymentGatewayWebHookController@genericConfirm');
});
});
Route::group(['prefix' => 'orders'], function () {
Route::group(['prefix' => '{order_hash}'], function () {
Route::group(['prefix' => 'tickets'], function () {
Route::put('', "OAuth2SummitOrdersApiController@updateTicketsByOrderHash");
});
});
Route::group(['prefix' => 'all'], function () {
Route::group(['prefix' => 'tickets'], function () {
Route::group(['prefix' => '{hash}'], function () {
Route::get('', "OAuth2SummitOrdersApiController@getTicketByHash");
Route::put('', "OAuth2SummitOrdersApiController@updateTicketByHash");
Route::put('regenerate', "OAuth2SummitOrdersApiController@regenerateTicketHash");
Route::get('pdf', "OAuth2SummitOrdersApiController@getTicketPDFByHash");
});
});
});
});
});
Route::group(['prefix' => '{id}'], function () {
Route::group(['prefix' => 'payments'], function () {
Route::group(['prefix' => '{application_name}'], function () {
Route::post('confirm', 'PaymentGatewayWebHookController@confirm');
});
});
Route::group(['prefix' => 'selection-plans'], function () {
Route::get('current/{status}', 'OAuth2SummitSelectionPlansApiController@getCurrentSelectionPlanByStatus')->where('status', 'submission|selection|voting');
});
Route::get('', [ 'middleware' => 'cache:'.Config::get('cache_api_response.get_summit_response_lifetime', 1200), 'uses' => 'OAuth2SummitApiController@getSummit'])->where('id', 'current|[0-9]+');
// members
Route::group(['prefix' => 'members'], function () {
Route::group(['prefix' => 'all'], function () {
Route::group(['prefix' => 'schedule'], function () {
Route::group(['prefix' => 'ics'], function () {
Route::get('{cid}', 'OAuth2SummitMembersApiController@getCalendarFeedICS');
});
});
});
});
// events
Route::group(['prefix' => 'events'], function () {
Route::group(['prefix' => 'published'], function () {
Route::get('', [ 'middleware' => 'cache:1200', 'uses' => 'OAuth2SummitEventsApiController@getScheduledEvents']);
});
Route::group(array('prefix' => '{event_id}'), function () {
Route::group(['prefix' => 'published'], function () {
Route::get('', [ 'middleware' => 'cache:'.Config::get('cache_api_response.get_published_event_response_lifetime', 300), 'uses' => 'OAuth2SummitEventsApiController@getScheduledEvent']);
});
});
Route::group(['prefix' => 'all'], function () {
Route::group(['prefix' => 'published'], function () {
Route::get('tags', 'OAuth2SummitEventsApiController@getScheduledEventsTags');
});
});
});
// locations
Route::group(['prefix' => 'locations'], function () {
Route::group(['prefix' => '{location_id}'], function () {
Route::get('', 'OAuth2SummitLocationsApiController@getLocation');
Route::get('/events/published', 'OAuth2SummitLocationsApiController@getLocationPublishedEvents');
Route::group(['prefix' => 'banners'], function () {
Route::get('', 'OAuth2SummitLocationsApiController@getLocationBanners');
});
});
});
// notifications
Route::group(['prefix' => 'notifications'], function () {
Route::get('sent', 'OAuth2SummitNotificationsApiController@getAllApprovedByUser');
});
// speakers
Route::group(['prefix' => 'speakers'], function () {
Route::get('', 'OAuth2SummitSpeakersApiController@getSpeakers');
Route::group(['prefix' => '{speaker_id}'], function () {
Route::get('', 'OAuth2SummitSpeakersApiController@getSummitSpeaker')->where('speaker_id', '[0-9]+');
});
});
// orders
Route::group(['prefix' => 'orders'], function () {
Route::post('reserve', 'OAuth2SummitOrdersApiController@reserve');
Route::group(['prefix' => '{hash}'], function () {
Route::put('checkout', 'OAuth2SummitOrdersApiController@checkout');
Route::group(['prefix' => 'tickets'], function () {
Route::get('mine', 'OAuth2SummitOrdersApiController@getMyTicketByOrderHash');
});
Route::delete('', 'OAuth2SummitOrdersApiController@cancel');
});
});
// registration invitations
Route::group(['prefix' => 'registration-invitations'], function () {
Route::group(['prefix' => '{email}'], function () {
Route::get('', 'OAuth2SummitOrdersApiController@getByEmail');
});
});
});
});
// marketplace
Route::group(array('prefix' => 'marketplace'), function () {
Route::group(array('prefix' => 'appliances'), function () {
Route::get('', 'AppliancesApiController@getAll');
});
Route::group(array('prefix' => 'distros'), function () {
Route::get('', 'DistributionsApiController@getAll');
});
Route::group(array('prefix' => 'consultants'), function () {
Route::get('', 'ConsultantsApiController@getAll');
});
Route::group(array('prefix' => 'hosted-private-clouds'), function () {
Route::get('', 'PrivateCloudsApiController@getAll');
});
Route::group(array('prefix' => 'remotely-managed-private-clouds'), function () {
Route::get('', 'RemoteCloudsApiController@getAll');
});
Route::group(array('prefix' => 'public-clouds'), function () {
Route::get('', 'PublicCloudsApiController@getAll');
});
});
// countries
Route::group(array('prefix' => 'countries'), function () {
Route::get('', 'CountriesApiController@getAll');
});
// languages
Route::group(array('prefix' => 'languages'), function () {
Route::get('', 'LanguagesApiController@getAll');
});
// timezones
Route::group(array('prefix' => 'timezones'), function () {
Route::get('', 'TimezonesApiController@getAll');
});
});
Route::group([
'namespace' => 'App\Http\Controllers',
'prefix' => '.well-known',
'before' => [],
'after' => [],
'middleware' => [
'ssl',
'rate.limit:1000,1', // 1000 request per minute
]
], function(){
Route::get('endpoints', 'ConfigurationsController@getEndpointsDefinitions');
});

26
app/Http/Utils/Filters/Filter.php
View File

@ -70,7 +70,9 @@ final class Filter
$or_res[] = $e;
}
}
if (count($or_res)) $res[] = $or_res;
foreach ($or_res as $e){
$res[] = $e;
}
}
}
return $res;
@ -569,4 +571,26 @@ final class Filter
}
return $list;
}
public function __toString():string
{
$res = "";
foreach ($this->filters as $filter) {
if ($filter instanceof FilterElement) {
$res .= '('.$filter.')';
}
else if (is_array($filter)) {
// OR
$or_res = [];
foreach ($filter as $e) {
if ($e instanceof FilterElement) {
$or_res[] = '('.$e.')';
}
}
if (count($or_res)) $res = '('.implode("|",$or_res).')';
}
}
return $res;
}
}

5
app/Http/Utils/Filters/FilterElement.php
View File

@ -124,4 +124,9 @@ class FilterElement extends AbstractFilterElement
{
return new self($field, $value, 'like', $same_field_op);
}
public function __toString():string
{
return sprintf("%s%s%s", $this->field, $this->operator, is_array($this->value)? json_encode($this->value):$this->value);
}
}

1
app/Http/Utils/Filters/FilterParser.php
View File

@ -1,5 +1,4 @@
<?php namespace utils;
use models\exceptions\ValidationException;
/**
* Copyright 2015 OpenStack Foundation

15
app/Http/Utils/Logs/LaravelMailerHandler.php
View File

@ -14,6 +14,7 @@
use Illuminate\Mail\Message;
use Illuminate\Support\Facades\Log;
use libs\utils\ICacheService;
use Monolog\Formatter\FormatterInterface;
use Monolog\Handler\MailHandler;
use Monolog\Logger;
use Monolog\Formatter\LineFormatter;
@ -93,7 +94,7 @@ final class LaravelMailerHandler extends MailHandler
$this->cacheService = $cacheService;
$this->from = $from;
$this->to = is_array($to) ? $to : array($to);
$this->subject = $subject;
$this->subject = empty($subject) ? 'API ERROR' : $subject;
$this->addHeader(sprintf('From: %s', $from));
$this->maxColumnWidth = $maxColumnWidth;
}
@ -132,7 +133,7 @@ final class LaravelMailerHandler extends MailHandler
/**
* {@inheritdoc}
*/
protected function send($content, array $records)
protected function send($content, array $records):void
{
$content = wordwrap($content, $this->maxColumnWidth);
@ -210,4 +211,14 @@ final class LaravelMailerHandler extends MailHandler
return $this;
}
/**
* Gets the default formatter.
*
* @return FormatterInterface
*/
protected function getDefaultFormatter(): FormatterInterface
{
return new LineFormatter();
}
}

1602
app/Http/routes.php
View File

File diff suppressed because it is too large Load Diff

5
app/Jobs/ProcessEventDataImport.php
View File

@ -29,9 +29,10 @@ class ProcessEventDataImport implements ShouldQueue
public $tries = 2;
public $timeout = PHP_INT_MAX;
// no timeout
public $timeout = 0;
/**
/*
* @var int
*/
private $summit_id;

3
app/Jobs/ProcessTicketDataImport.php
View File

@ -32,7 +32,8 @@ class ProcessTicketDataImport implements ShouldQueue
public $tries = 2;
public $timeout = PHP_INT_MAX;
// no timeout
public $timeout = 0;
/**
* @var int

3
app/Jobs/SynchAllPresentationActions.php
View File

@ -28,7 +28,8 @@ class SynchAllPresentationActions implements ShouldQueue
{
public $tries = 2;
public $timeout = PHP_INT_MAX;
// no timeout
public $timeout = 0;
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;

3
app/Jobs/SynchPresentationActions.php
View File

@ -30,7 +30,8 @@ class SynchPresentationActions implements ShouldQueue
{
public $tries = 2;
public $timeout = PHP_INT_MAX;
// no timeout
public $timeout = 0;
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;

3
app/ModelSerializers/Summit/Presentation/PresentationSerializer.php
View File

@ -31,7 +31,6 @@ class PresentationSerializer extends SummitEventSerializer
'ProgressNice' => 'progress:json_string',
'Slug' => 'slug:json_string',
'SelectionStatus' => 'selection_status:string',
'WillAllSpeakersAttend' => 'will_all_speakers_attend:json_boolean',
'DisclaimerAcceptedDate' => 'disclaimer_accepted_date:datetime_epoch',
'DisclaimerAccepted' => 'disclaimer_accepted:json_boolean',
];
@ -49,7 +48,7 @@ class PresentationSerializer extends SummitEventSerializer
'progress',
'selection_status',
'disclaimer_accepted_date',
'disclaimer_accepted'
'disclaimer_accepted',
];
protected static $allowed_relations = [

2
app/Models/Foundation/Main/Member.php
View File

@ -1473,6 +1473,7 @@ SQL;
*/
public function setFirstName(?string $first_name): void
{
Log::debug(sprintf("Member::setFirstName %s (%s)", $first_name, $this->id));
$this->first_name = $first_name;
}
@ -1489,6 +1490,7 @@ SQL;
*/
public function setLastName(?string $last_name): void
{
Log::debug(sprintf("Member::setLastName %s (%s)", $last_name, $this->id));
$this->last_name = $last_name;
}

2
app/Models/Foundation/Summit/Events/Presentations/Materials/PresentationMaterial.php
View File

@ -198,7 +198,7 @@ abstract class PresentationMaterial extends SilverstripeBaseModel implements IOr
* @ORM\PostPersist
*/
public function inserted($args){
Event::fire(new PresentationMaterialCreated($this));
Event::dispatch(new PresentationMaterialCreated($this));
}
public function clearPresentation(){

6
app/Models/Foundation/Summit/Events/SummitEvent.php
View File

@ -802,7 +802,7 @@ class SummitEvent extends SilverstripeBaseModel
{
if (is_null($this->summit)) return;
if ($this->summit->isDeleting()) return;
Event::fire(new SummitEventDeleted(null, $this->pre_remove_events));
Event::dispatch(new SummitEventDeleted(null, $this->pre_remove_events));
$this->pre_remove_events = null;
}
@ -819,7 +819,7 @@ class SummitEvent extends SilverstripeBaseModel
*/
public function updated($args)
{
Event::fire(new SummitEventUpdated($this, $this->pre_update_args));
Event::dispatch(new SummitEventUpdated($this, $this->pre_update_args));
$this->pre_update_args = null;
}
@ -830,7 +830,7 @@ class SummitEvent extends SilverstripeBaseModel
*/
public function inserted($args)
{
Event::fire(new SummitEventCreated($this, $args));
Event::dispatch(new SummitEventCreated($this, $args));
}
/**

8
app/Models/Foundation/Summit/Locations/SummitRoomReservation.php
View File

@ -133,7 +133,7 @@ class SummitRoomReservation extends SilverstripeBaseModel
public function refund(int $amount){
$this->status = self::RefundedStatus;
$this->refunded_amount = $amount;
Event::fire(new BookableRoomReservationRefundAccepted($this->getId()));
Event::dispatch(new BookableRoomReservationRefundAccepted($this->getId()));
}
/**
@ -332,17 +332,17 @@ class SummitRoomReservation extends SilverstripeBaseModel
$this->status = self::PaidStatus;
$now = new \DateTime('now', new \DateTimeZone('UTC'));
$this->approved_payment_date = $now;
Event::fire(new PaymentBookableRoomReservationConfirmed($this->getId()));
Event::dispatch(new PaymentBookableRoomReservationConfirmed($this->getId()));
}
public function cancel():void{
$this->status = self::Canceled;
Event::fire(new BookableRoomReservationCanceled($this->id));
Event::dispatch(new BookableRoomReservationCanceled($this->id));
}
public function requestRefund():void{
$this->status = self::RequestedRefundStatus;
Event::fire(new RequestedBookableRoomReservationRefund($this->getId()));
Event::dispatch(new RequestedBookableRoomReservationRefund($this->getId()));
}
/**

4
app/Models/Foundation/Summit/Registration/Attendees/SummitAttendeeTicket.php
View File

@ -661,7 +661,7 @@ class SummitAttendeeTicket extends SilverstripeBaseModel
$promo_codes_to_return[$this->getPromoCode()->getCode()] +=1;
}
Event::fire(new SummitAttendeeTicketRefundAccepted($this->getId(), $tickets_to_return, $promo_codes_to_return));
Event::dispatch(new SummitAttendeeTicketRefundAccepted($this->getId(), $tickets_to_return, $promo_codes_to_return));
}
/**
@ -757,7 +757,7 @@ class SummitAttendeeTicket extends SilverstripeBaseModel
$this->status = IOrderConstants::RefundRequestedStatus;
if (!$refund_entire_order)
Event::fire(new RequestedSummitAttendeeTicketRefund($this->getId(), $days_before_event_starts));
Event::dispatch(new RequestedSummitAttendeeTicketRefund($this->getId(), $days_before_event_starts));
}
/**

Some files were not shown because too many files have changed in this diff Show More