diff --git a/Changelog b/Changelog index 57bb2d71c..d6bd63e71 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2019-02-24 DariusIII + * Chg: Move rss routes to their own route file * Chg: Move RSS route out of authentification * Chg: Change routes handling for api and rss 2019-02-22 DariusIII diff --git a/app/Http/Controllers/RssController.php b/app/Http/Controllers/RssController.php index 3e36a3357..b6e32d3a2 100644 --- a/app/Http/Controllers/RssController.php +++ b/app/Http/Controllers/RssController.php @@ -72,11 +72,11 @@ class RssController extends BasePageController $rssToken = $this->userdata['api_token']; $maxRequests = $this->userdata->role->apirequests; } else { - if (! $request->has('r')) { + if (! $request->has('api_token')) { Utility::showApiError(100, 'API key is required for viewing the RSS!'); } - $res = User::getByRssToken($request->input('r')); + $res = User::getByRssToken($request->input('api_token')); if ($res === null) { return response()->json(['error' => 'Invalid RSS token'], 403); diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 5ea48d39d..3bc65d7e0 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -39,7 +39,7 @@ class RouteServiceProvider extends ServiceProvider $this->mapWebRoutes(); - // + $this->mapRssRoutes(); } /** @@ -70,4 +70,18 @@ class RouteServiceProvider extends ServiceProvider ->namespace($this->namespace) ->group(base_path('routes/api.php')); } + + /** + * Define the "rss" routes for the application. + * + * These routes are typically stateless. + * + * @return void + */ + protected function mapRssRoutes() + { + Route::middleware(['api', 'auth:api']) + ->namespace($this->namespace) + ->group(base_path('routes/rss.php')); + } } diff --git a/composer.json b/composer.json index d71f20d6c..4a8d55808 100755 --- a/composer.json +++ b/composer.json @@ -136,6 +136,7 @@ "rtconner/laravel-tagging": "^3.0", "smarty/smarty": "^3.1", "spatie/laravel-directory-cleanup": "^1.2", + "spatie/laravel-feed": "^2.1", "spatie/laravel-fractal": "^5.3", "spatie/laravel-permission": "^2.12", "tunaabutbul/cloudflare-middleware": "^1.2", diff --git a/composer.lock b/composer.lock index 42517f3e7..58ece135e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "2bb038c6329ef149ab0a4d7f30b2371e", + "content-hash": "f71a4761addac08399fd0311cda48c1b", "packages": [ { "name": "aharen/omdbapi", @@ -5990,6 +5990,77 @@ ], "time": "2019-01-18T16:32:41+00:00" }, + { + "name": "spatie/laravel-feed", + "version": "2.1.1", + "source": { + "type": "git", + "url": "https://github.com/spatie/laravel-feed.git", + "reference": "ee9aab3b33553e0f621ccd9c0cbc2016a5be73e5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spatie/laravel-feed/zipball/ee9aab3b33553e0f621ccd9c0cbc2016a5be73e5", + "reference": "ee9aab3b33553e0f621ccd9c0cbc2016a5be73e5", + "shasum": "" + }, + "require": { + "laravel/framework": "~5.5.0|~5.6.0|~5.7.0", + "nesbot/carbon": "^1.0", + "php": "^7.0" + }, + "require-dev": { + "orchestra/testbench": "~3.5.0|~3.6.0|~3.7.0", + "phpunit/phpunit": "^6.0|^7.0", + "spatie/phpunit-snapshot-assertions": "^1.0" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Spatie\\Feed\\FeedServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "Spatie\\Feed\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Sebastian De Deyne", + "email": "sebastian@spatie.be", + "homepage": "https://spatie.be", + "role": "Developer" + }, + { + "name": "Freek Van der Herten", + "email": "freek@spatie.be", + "homepage": "https://spatie.be", + "role": "Developer" + }, + { + "name": "Jolita Grazyte", + "email": "jolita@spatie.be", + "homepage": "https://spatie.be", + "role": "Developer" + } + ], + "description": "Generates rss feed", + "homepage": "https://github.com/spatie/laravel-feed", + "keywords": [ + "laravel", + "laravel-feed", + "rss", + "spatie" + ], + "time": "2018-08-27T15:07:12+00:00" + }, { "name": "spatie/laravel-fractal", "version": "5.4.3", diff --git a/resources/views/themes/shared/rssdesc.tpl b/resources/views/themes/shared/rssdesc.tpl index 767ef4b20..ec15f4e85 100755 --- a/resources/views/themes/shared/rssdesc.tpl +++ b/resources/views/themes/shared/rssdesc.tpl @@ -7,8 +7,8 @@

Parent Category

@@ -64,8 +64,8 @@ {foreach $parentcategorylist as $category}
  • {$category.title} feed
    - {$smarty.const.WWW_TOP} - /rss?t={$category.id}&dl=1&i={$userdata.id}&r={$userdata.api_token} + {$smarty.const.WWW_TOP} + /rss?t={$category.id}&dl=1$amp;api_token={$userdata.api_token}
    • {/foreach} @@ -75,8 +75,8 @@ {if !empty($category.title)}
  • {$category.title} feed
    - {$smarty.const.WWW_TOP} - /rss?t={$category.id}&dl=1&i={$userdata.id}&r={$userdata.api_token} + {$smarty.const.WWW_TOP} + /rss?t={$category.id}&dl=1$amp;api_token={$userdata.api_token}
    • {/if} {/foreach} @@ -85,27 +85,27 @@

    Additional Feeds

    diff --git a/routes/rss.php b/routes/rss.php new file mode 100644 index 000000000..a27632edc --- /dev/null +++ b/routes/rss.php @@ -0,0 +1,14 @@ +