From b9efa52a92348cda8b210834d363ec2c2e7da879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Ba=C4=8Do?= Date: Tue, 2 May 2023 13:25:38 +0200 Subject: [PATCH] Revert changes --- app/controllers/api/avatars.php | 9 ++++++--- src/Appwrite/Platform/Tasks/ClearCardCache.php | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/controllers/api/avatars.php b/app/controllers/api/avatars.php index daa535e734..4801d87b7a 100644 --- a/app/controllers/api/avatars.php +++ b/app/controllers/api/avatars.php @@ -558,7 +558,8 @@ App::get('/v1/cards/cloud') ->groups(['api', 'avatars']) ->label('scope', 'avatars.read') ->label('cache', true) - ->label('cache.resource', 'card-cloud/{request.userId}') + ->label('cache.resourceType', 'cards/cloud') + ->label('cache.resource', 'card/{request.userId}') ->label('docs', false) ->label('origin', '*') ->param('userId', '', new UID(), 'User ID.', true) @@ -764,7 +765,8 @@ App::get('/v1/cards/cloud-back') ->groups(['api', 'avatars']) ->label('scope', 'avatars.read') ->label('cache', true) - ->label('cache.resource', 'card-cloud-back/{request.userId}') + ->label('cache.resourceType', 'cards/cloud-back') + ->label('cache.resource', 'card-back/{request.userId}') ->label('docs', false) ->label('origin', '*') ->param('userId', '', new UID(), 'User ID.', true) @@ -841,7 +843,8 @@ App::get('/v1/cards/cloud-og') ->groups(['api', 'avatars']) ->label('scope', 'avatars.read') ->label('cache', true) - ->label('cache.resource', 'card-cloud-og/{request.userId}') + ->label('cache.resourceType', 'cards/cloud-og') + ->label('cache.resource', 'card-og/{request.userId}') ->label('docs', false) ->label('origin', '*') ->param('userId', '', new UID(), 'User ID.', true) diff --git a/src/Appwrite/Platform/Tasks/ClearCardCache.php b/src/Appwrite/Platform/Tasks/ClearCardCache.php index 7bee0c1a98..d7fc1465bf 100644 --- a/src/Appwrite/Platform/Tasks/ClearCardCache.php +++ b/src/Appwrite/Platform/Tasks/ClearCardCache.php @@ -34,7 +34,7 @@ class ClearCardCache extends Action Console::title('ClearCardCache V1'); Console::success(APP_NAME . ' ClearCardCache v1 has started'); - $resources = ['card-cloud/' . $userId, 'card-cloud-back/' . $userId, 'card-cloud-og/' . $userId]; + $resources = ['card/' . $userId, 'card-back/' . $userId, 'card-og/' . $userId]; $caches = Authorization::skip(fn () => $dbForConsole->find('cache', [ Query::equal('resource', $resources),