diff --git a/Changelog b/Changelog index 8516559b7..57bb2d71c 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2019-02-24 DariusIII + * Chg: Move RSS route out of authentification * Chg: Change routes handling for api and rss 2019-02-22 DariusIII * Chg: Update middleware in routes/web.php diff --git a/app/Http/Controllers/RssController.php b/app/Http/Controllers/RssController.php index 2173ed070..3deba1862 100644 --- a/app/Http/Controllers/RssController.php +++ b/app/Http/Controllers/RssController.php @@ -79,7 +79,7 @@ class RssController extends BasePageController $res = User::getByRssToken($request->input('r')); if (! $res) { - Utility::showApiError(100); + return response()->json(['error' => 'Invalid RSS token'], 403); } $uid = $res['id']; diff --git a/routes/api.php b/routes/api.php index 7d070d159..aa5f03c8b 100644 --- a/routes/api.php +++ b/routes/api.php @@ -25,8 +25,8 @@ Route::group(['prefix' => 'v2', 'namespace' => 'Api'], function () { Route::group(['prefix' => 'v2', 'namespace' => 'Api', 'middleware' => ['auth:api', 'throttle:rate_limit,1', 'fw-block-blacklisted']], function () { Route::get('movies', 'ApiV2Controller@movie'); Route::post('movies', 'ApiV2Controller@movie'); - Route::get('search', 'ApiV2Controller@search'); - Route::post('search', 'ApiV2Controller@search'); + Route::get('search', 'ApiV2Controller@apiSearch'); + Route::post('search', 'ApiV2Controller@apiSearch'); Route::get('tv', 'ApiV2Controller@tv'); Route::post('tv', 'ApiV2Controller@tv'); Route::get('getnzb', 'ApiV2Controller@getNzb'); diff --git a/routes/web.php b/routes/web.php index 0a3063a2b..be5387882 100644 --- a/routes/web.php +++ b/routes/web.php @@ -29,7 +29,7 @@ Route::get('login', 'Auth\LoginController@showLoginForm'); Route::post('login', 'Auth\LoginController@login')->name('login'); Route::get('logout', 'Auth\LoginController@logout')->name('logout'); -Route::group(['middleware' => ['auth', 'web', 'isVerified', 'fw-block-blacklisted']], function () { +Route::group(['middleware' => ['isVerified', 'fw-block-blacklisted']], function () { Route::get('resetpassword', 'Auth\ResetPasswordController@reset'); Route::post('resetpassword', 'Auth\ResetPasswordController@reset'); @@ -57,10 +57,6 @@ Route::group(['middleware' => ['auth', 'web', 'isVerified', 'fw-block-blackliste Route::get('getnzb', 'GetNzbController@getNzb'); Route::post('getnzb', 'GetNzbController@getNzb'); - Route::get('rss', 'RssController@rss'); - - Route::post('rss', 'RssController@rss'); - Route::get('profile', 'ProfileController@show'); Route::get('apihelp', 'ApiHelpController@index'); @@ -214,7 +210,7 @@ Route::get('forum-delete/{id}', 'ForumController@destroy')->middleware('role:Adm Route::post('forum-delete/{id}', 'ForumController@destroy')->middleware('role:Admin'); -Route::group(['middleware' => ['auth', 'web', 'role:Admin'], 'prefix' => 'admin', 'namespace' => 'Admin'], function () { +Route::group(['middleware' => ['role:Admin'], 'prefix' => 'admin', 'namespace' => 'Admin'], function () { Route::get('index', 'AdminPageController@index'); Route::get('anidb-delete/{id}', 'AnidbController@destroy'); Route::post('anidb-delete/{id}', 'AnidbController@destroy'); @@ -341,3 +337,6 @@ Route::group(['middleware' => ['role_or_permission:Admin|Moderator|edit release' Route::get('release-edit', 'ReleasesController@edit'); Route::post('release-edit', 'ReleasesController@edit'); }); + +Route::get('rss', 'RssController@rss'); +Route::post('rss', 'RssController@rss'); \ No newline at end of file