Check if request has api_token(v2 API) or apikey(v1 API)

This commit is contained in:
DariusIII
2018-12-12 21:14:46 +01:00
parent ee074c1d08
commit a8aecf2e5d
2 changed files with 3 additions and 1 deletions
+1
View File
@@ -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
+2 -1
View File
@@ -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);
}