From a8aecf2e5d2ff770306dcd6b1b5cfd9a667f5ef1 Mon Sep 17 00:00:00 2001
From: DariusIII <dkrisan@gmail.com>
Date: Wed, 12 Dec 2018 21:14:46 +0100
Subject: [PATCH] Check if request has api_token(v2 API) or apikey(v1 API)

---
 Changelog           | 1 +
 app/Models/User.php | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Changelog b/Changelog
index 98a244ae5..bf74ea199 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 2018-12-12 DariusIII
+	* Chg: Check if request has api_token(v2 API) or apikey(v1 API)
 	* Fix: Fix User error on APIv2 and ApiTransformer data
 	* Chg: Update user category exclusion handling in API and APIv2
 	* Chg: Remove requirement for userid when using RSS, API and APIv2, its useless as we already have the token
diff --git a/app/Models/User.php b/app/Models/User.php
index 6d35b226d..0fdfad46c 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -862,7 +862,8 @@ class User extends Authenticatable
      */
     public static function getCategoryExclusionForApi(Request $request): array
     {
-        $user = self::getByRssToken($request->input('api_token'));
+        $apiToken = $request->has('api_token') ? $request->input('api_token') : $request->input('apikey');
+        $user = self::getByRssToken($apiToken);
 
         return self::getCategoryExclusionById($user->id);
     }