From 137021fcdcad0301a8256c25e370385b20c88fe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=8Carodej?= Date: Wed, 4 May 2022 08:36:32 +0200 Subject: [PATCH] personal access token api update --- .../Account/UpdatePasswordController.php | 19 ++++++---- .../UpdateProfileSettingsController.php | 2 +- .../AccountAccessTokenController.php | 38 ++++++++++++------- ...quest.php => CreateAccessTokenRequest.php} | 2 +- .../Users/ChangeUserRoleController.php | 2 +- .../ChangeUserStorageCapacityController.php | 2 +- .../Controllers/UploadFileController.php | 2 +- .../VisitorUploadFileController.php | 2 +- .../Controllers/CreateFolderController.php | 2 +- .../Controllers/FavouriteController.php | 4 +- .../VisitorCreateFolderController.php | 2 +- .../DeleteFileOrFolderController.php | 2 +- .../MoveFileOrFolderController.php | 2 +- .../RenameFileOrFolderController.php | 2 +- .../VisitorDeleteFileOrFolderController.php | 2 +- .../VisitorMoveFileOrFolderController.php | 2 +- .../VisitorRenameFileOrFolderController.php | 2 +- .../FlushUserNotificationsController.php | 2 +- .../MarkUserNotificationsAsReadController.php | 2 +- .../RemoteUploadFileController.php | 2 +- ...arActionInInvitationNotificationAction.php | 2 +- .../ConvertFolderIntoTeamFolderController.php | 2 +- .../Controllers/InvitationsController.php | 4 +- .../Controllers/LeaveTeamFolderController.php | 2 +- .../Controllers/TeamFoldersController.php | 6 +-- .../Trash/Controllers/DumpTrashController.php | 2 +- .../RestoreTrashContentController.php | 2 +- src/Support/helpers.php | 4 +- 28 files changed, 66 insertions(+), 53 deletions(-) rename src/App/Users/Requests/{UserCreateAccessTokenRequest.php => CreateAccessTokenRequest.php} (89%) diff --git a/src/App/Users/Controllers/Account/UpdatePasswordController.php b/src/App/Users/Controllers/Account/UpdatePasswordController.php index 8d7eab67..3aba017d 100644 --- a/src/App/Users/Controllers/Account/UpdatePasswordController.php +++ b/src/App/Users/Controllers/Account/UpdatePasswordController.php @@ -1,26 +1,29 @@ 'success', + 'message' => "The password was successfully changed.", + ]; - $user = Auth::user(); + if (isDemoAccount()) { + return response()->json($successMessage); + } // Store new password - $user->update([ + auth()->user()->update([ 'password' => bcrypt($request->input('password')), ]); - return response('Changed!', 204); + return response()->json($successMessage); } } diff --git a/src/App/Users/Controllers/Account/UpdateProfileSettingsController.php b/src/App/Users/Controllers/Account/UpdateProfileSettingsController.php index 64340667..08470ea4 100644 --- a/src/App/Users/Controllers/Account/UpdateProfileSettingsController.php +++ b/src/App/Users/Controllers/Account/UpdateProfileSettingsController.php @@ -21,7 +21,7 @@ class UpdateProfileSettingsController extends Controller ]; // Check if is demo - if (is_demo_account()) { + if (isDemoAccount()) { return response()->json($successMessage); } diff --git a/src/App/Users/Controllers/Authentication/AccountAccessTokenController.php b/src/App/Users/Controllers/Authentication/AccountAccessTokenController.php index 272c8236..b88ad4e0 100644 --- a/src/App/Users/Controllers/Authentication/AccountAccessTokenController.php +++ b/src/App/Users/Controllers/Authentication/AccountAccessTokenController.php @@ -1,12 +1,13 @@ tokens()->get(), - 200 + Auth::user()->tokens()->get() ); } /** * Create user tokens */ - public function store(UserCreateAccessTokenRequest $request): Response + public function store(CreateAccessTokenRequest $request): JsonResponse { - if (is_demo_account()) { - return response(['plainTextToken' => Str::random(40)], 201); + if (isDemoAccount()) { + return response()->json([ + 'plainTextToken' => Str::random(40) + ], 201); } $token = Auth::user() - ->createToken( - $request->input('name') - ); + ->createToken($request->input('name')); - return response($token, 201); + return response()->json($token, 201); } /** * Delete user token */ - public function destroy(PersonalAccessToken $token): Response + public function destroy(PersonalAccessToken $token): JsonResponse { - abort_if(is_demo_account(), 204, 'Deleted!'); + $successMessage = [ + 'type' => 'success', + 'message' => "The token was successfully deleted.", + ]; + + if (isDemoAccount()) { + return response()->json($successMessage); + } if (Auth::id() !== $token->tokenable_id) { - return response('Unauthorized', 401); + return response()->json([ + 'type' => 'error', + 'message' => "You are not entitled to delete this token.", + ], 401); } $token->delete(); - return response('Deleted!', 204); + return response()->json($successMessage, 200); } } diff --git a/src/App/Users/Requests/UserCreateAccessTokenRequest.php b/src/App/Users/Requests/CreateAccessTokenRequest.php similarity index 89% rename from src/App/Users/Requests/UserCreateAccessTokenRequest.php rename to src/App/Users/Requests/CreateAccessTokenRequest.php index 69238a6f..db76af00 100644 --- a/src/App/Users/Requests/UserCreateAccessTokenRequest.php +++ b/src/App/Users/Requests/CreateAccessTokenRequest.php @@ -3,7 +3,7 @@ namespace App\Users\Requests; use Illuminate\Foundation\Http\FormRequest; -class UserCreateAccessTokenRequest extends FormRequest +class CreateAccessTokenRequest extends FormRequest { /** * Determine if the user is authorized to make this request. diff --git a/src/Domain/Admin/Controllers/Users/ChangeUserRoleController.php b/src/Domain/Admin/Controllers/Users/ChangeUserRoleController.php index a7600112..8d2df2e0 100644 --- a/src/Domain/Admin/Controllers/Users/ChangeUserRoleController.php +++ b/src/Domain/Admin/Controllers/Users/ChangeUserRoleController.php @@ -12,7 +12,7 @@ class ChangeUserRoleController extends Controller ChangeRoleRequest $request, User $user, ): UserResource { - if (is_demo_account()) { + if (isDemoAccount()) { return new UserResource($user); } diff --git a/src/Domain/Admin/Controllers/Users/ChangeUserStorageCapacityController.php b/src/Domain/Admin/Controllers/Users/ChangeUserStorageCapacityController.php index 98e1fd1f..51082f08 100644 --- a/src/Domain/Admin/Controllers/Users/ChangeUserStorageCapacityController.php +++ b/src/Domain/Admin/Controllers/Users/ChangeUserStorageCapacityController.php @@ -16,7 +16,7 @@ class ChangeUserStorageCapacityController extends Controller User $user, ): UserStorageResource { // Abort in demo mode - if (is_demo_account()) { + if (isDemoAccount()) { return new UserStorageResource($user); } diff --git a/src/Domain/Files/Controllers/UploadFileController.php b/src/Domain/Files/Controllers/UploadFileController.php index ceb79c87..a61b72e9 100644 --- a/src/Domain/Files/Controllers/UploadFileController.php +++ b/src/Domain/Files/Controllers/UploadFileController.php @@ -26,7 +26,7 @@ class UploadFileController extends Controller */ public function __invoke(UploadRequest $request) { - if (is_demo_account()) { + if (isDemoAccount()) { return ($this->fakeUploadFile)($request); } diff --git a/src/Domain/Files/Controllers/VisitorUploadFileController.php b/src/Domain/Files/Controllers/VisitorUploadFileController.php index c709b285..b3ef23fa 100644 --- a/src/Domain/Files/Controllers/VisitorUploadFileController.php +++ b/src/Domain/Files/Controllers/VisitorUploadFileController.php @@ -33,7 +33,7 @@ class VisitorUploadFileController extends Controller UploadRequest $request, Share $shared, ) { - if (is_demo_account()) { + if (isDemoAccount()) { return ($this->fakeUploadFile)($request); } diff --git a/src/Domain/Folders/Controllers/CreateFolderController.php b/src/Domain/Folders/Controllers/CreateFolderController.php index 325a928a..cda8fa07 100644 --- a/src/Domain/Folders/Controllers/CreateFolderController.php +++ b/src/Domain/Folders/Controllers/CreateFolderController.php @@ -23,7 +23,7 @@ class CreateFolderController extends Controller public function __invoke( CreateFolderRequest $request, ): JsonResponse { - if (is_demo_account()) { + if (isDemoAccount()) { $fakeFolder = ($this->fakeCreateFolder)($request); return response()->json(new FolderResource($fakeFolder), 201); diff --git a/src/Domain/Folders/Controllers/FavouriteController.php b/src/Domain/Folders/Controllers/FavouriteController.php index b8d5d3ef..ce46b122 100644 --- a/src/Domain/Folders/Controllers/FavouriteController.php +++ b/src/Domain/Folders/Controllers/FavouriteController.php @@ -19,7 +19,7 @@ class FavouriteController extends Controller ]; // Return success response for the demo response - if (is_demo_account()) { + if (isDemoAccount()) { return response()->json($successResponse, 201); } @@ -44,7 +44,7 @@ class FavouriteController extends Controller 'message' => 'Folder was successfully removed from your favourites folders', ]; - if (is_demo_account()) { + if (isDemoAccount()) { return response()->json($successResponse, 201); } diff --git a/src/Domain/Folders/Controllers/VisitorCreateFolderController.php b/src/Domain/Folders/Controllers/VisitorCreateFolderController.php index d4dee71f..d8ce4cdb 100644 --- a/src/Domain/Folders/Controllers/VisitorCreateFolderController.php +++ b/src/Domain/Folders/Controllers/VisitorCreateFolderController.php @@ -29,7 +29,7 @@ class VisitorCreateFolderController extends Controller CreateFolderRequest $request, Share $shared, ): Response | array { - if (is_demo_account()) { + if (isDemoAccount()) { $fakeFolder = ($this->fakeCreateFolder)($request); return response(new FolderResource($fakeFolder), 201); diff --git a/src/Domain/Items/Controllers/DeleteFileOrFolderController.php b/src/Domain/Items/Controllers/DeleteFileOrFolderController.php index f923a40f..de930711 100644 --- a/src/Domain/Items/Controllers/DeleteFileOrFolderController.php +++ b/src/Domain/Items/Controllers/DeleteFileOrFolderController.php @@ -24,7 +24,7 @@ class DeleteFileOrFolderController extends Controller 'message' => 'Items was successfully deleted.', ]; - if (is_demo_account()) { + if (isDemoAccount()) { return response()->json($successMessage); } diff --git a/src/Domain/Items/Controllers/MoveFileOrFolderController.php b/src/Domain/Items/Controllers/MoveFileOrFolderController.php index df8d136c..6f96168d 100644 --- a/src/Domain/Items/Controllers/MoveFileOrFolderController.php +++ b/src/Domain/Items/Controllers/MoveFileOrFolderController.php @@ -24,7 +24,7 @@ class MoveFileOrFolderController extends Controller 'message' => 'Items was successfully moved.', ]; - if (is_demo_account()) { + if (isDemoAccount()) { return response()->json($successMessage); } diff --git a/src/Domain/Items/Controllers/RenameFileOrFolderController.php b/src/Domain/Items/Controllers/RenameFileOrFolderController.php index 2e4deb71..7a01a792 100644 --- a/src/Domain/Items/Controllers/RenameFileOrFolderController.php +++ b/src/Domain/Items/Controllers/RenameFileOrFolderController.php @@ -28,7 +28,7 @@ class RenameFileOrFolderController extends Controller RenameItemRequest $request, string $id, ): FileResource|FolderResource { - if (is_demo_account()) { + if (isDemoAccount()) { $item = ($this->fakeRenameFileOrFolder)($request, $id); if ($request->input('type') === 'folder') { diff --git a/src/Domain/Items/Controllers/VisitorDeleteFileOrFolderController.php b/src/Domain/Items/Controllers/VisitorDeleteFileOrFolderController.php index af092c21..de20dc51 100644 --- a/src/Domain/Items/Controllers/VisitorDeleteFileOrFolderController.php +++ b/src/Domain/Items/Controllers/VisitorDeleteFileOrFolderController.php @@ -23,7 +23,7 @@ class VisitorDeleteFileOrFolderController extends Controller DeleteItemRequest $request, Share $shared, ): Response { - if (is_demo_account()) { + if (isDemoAccount()) { abort(204, 'Done.'); } diff --git a/src/Domain/Items/Controllers/VisitorMoveFileOrFolderController.php b/src/Domain/Items/Controllers/VisitorMoveFileOrFolderController.php index afa6d86e..6b6b4023 100644 --- a/src/Domain/Items/Controllers/VisitorMoveFileOrFolderController.php +++ b/src/Domain/Items/Controllers/VisitorMoveFileOrFolderController.php @@ -24,7 +24,7 @@ class VisitorMoveFileOrFolderController extends Controller MoveItemRequest $request, Share $shared, ): Response { - if (is_demo_account()) { + if (isDemoAccount()) { abort(204, 'Done.'); } diff --git a/src/Domain/Items/Controllers/VisitorRenameFileOrFolderController.php b/src/Domain/Items/Controllers/VisitorRenameFileOrFolderController.php index f4933e76..767edca8 100644 --- a/src/Domain/Items/Controllers/VisitorRenameFileOrFolderController.php +++ b/src/Domain/Items/Controllers/VisitorRenameFileOrFolderController.php @@ -31,7 +31,7 @@ class VisitorRenameFileOrFolderController extends Controller Share $shared, ): Response | array { // Return fake renamed item in demo - if (is_demo_account()) { + if (isDemoAccount()) { return ($this->fakeRenameFileOrFolder)($request, $id); } diff --git a/src/Domain/Notifications/Controllers/FlushUserNotificationsController.php b/src/Domain/Notifications/Controllers/FlushUserNotificationsController.php index 31649db7..b79a53c3 100644 --- a/src/Domain/Notifications/Controllers/FlushUserNotificationsController.php +++ b/src/Domain/Notifications/Controllers/FlushUserNotificationsController.php @@ -10,7 +10,7 @@ class FlushUserNotificationsController extends Controller { public function __invoke(): Response|Application|ResponseFactory { - if (is_demo_account()) { + if (isDemoAccount()) { return response('Done', 204); } diff --git a/src/Domain/Notifications/Controllers/MarkUserNotificationsAsReadController.php b/src/Domain/Notifications/Controllers/MarkUserNotificationsAsReadController.php index b886a8d4..62491dea 100644 --- a/src/Domain/Notifications/Controllers/MarkUserNotificationsAsReadController.php +++ b/src/Domain/Notifications/Controllers/MarkUserNotificationsAsReadController.php @@ -10,7 +10,7 @@ class MarkUserNotificationsAsReadController extends Controller { public function __invoke(): Response|Application|ResponseFactory { - if (is_demo_account()) { + if (isDemoAccount()) { return response('Done', 204); } diff --git a/src/Domain/RemoteUpload/Controllers/RemoteUploadFileController.php b/src/Domain/RemoteUpload/Controllers/RemoteUploadFileController.php index 43866161..feb3778e 100644 --- a/src/Domain/RemoteUpload/Controllers/RemoteUploadFileController.php +++ b/src/Domain/RemoteUpload/Controllers/RemoteUploadFileController.php @@ -22,7 +22,7 @@ class RemoteUploadFileController extends Controller 'message' => 'Files was successfully uploaded.', ]; - if (is_demo_account()) { + if (isDemoAccount()) { return response()->json($successMessage); } diff --git a/src/Domain/Teams/Actions/ClearActionInInvitationNotificationAction.php b/src/Domain/Teams/Actions/ClearActionInInvitationNotificationAction.php index 54308c4a..88c6116d 100644 --- a/src/Domain/Teams/Actions/ClearActionInInvitationNotificationAction.php +++ b/src/Domain/Teams/Actions/ClearActionInInvitationNotificationAction.php @@ -9,7 +9,7 @@ class ClearActionInInvitationNotificationAction { public function __invoke(User $user, TeamFolderInvitation $invitation): void { - if (is_demo_account()) { + if (isDemoAccount()) { return; } diff --git a/src/Domain/Teams/Controllers/ConvertFolderIntoTeamFolderController.php b/src/Domain/Teams/Controllers/ConvertFolderIntoTeamFolderController.php index 8a4e3cd7..63a582fb 100644 --- a/src/Domain/Teams/Controllers/ConvertFolderIntoTeamFolderController.php +++ b/src/Domain/Teams/Controllers/ConvertFolderIntoTeamFolderController.php @@ -23,7 +23,7 @@ class ConvertFolderIntoTeamFolderController extends Controller Folder $folder ): ResponseFactory|Response { // Abort in demo mode - if (is_demo_account()) { + if (isDemoAccount()) { return response($folder, 201); } diff --git a/src/Domain/Teams/Controllers/InvitationsController.php b/src/Domain/Teams/Controllers/InvitationsController.php index e8b4f183..c5313f32 100644 --- a/src/Domain/Teams/Controllers/InvitationsController.php +++ b/src/Domain/Teams/Controllers/InvitationsController.php @@ -29,7 +29,7 @@ class InvitationsController extends Controller ->first(); if ($user) { - if (is_demo_account()) { + if (isDemoAccount()) { return response('Done', 204); } @@ -67,7 +67,7 @@ class InvitationsController extends Controller // Clear action in existing notification if ($user) { - if (is_demo_account()) { + if (isDemoAccount()) { return response('Done', 204); } diff --git a/src/Domain/Teams/Controllers/LeaveTeamFolderController.php b/src/Domain/Teams/Controllers/LeaveTeamFolderController.php index c754d8fe..d8727104 100644 --- a/src/Domain/Teams/Controllers/LeaveTeamFolderController.php +++ b/src/Domain/Teams/Controllers/LeaveTeamFolderController.php @@ -14,7 +14,7 @@ class LeaveTeamFolderController extends Controller public function __invoke(Folder $folder): Response|Application|ResponseFactory { // Abort in demo mode - if (is_demo_account()) { + if (isDemoAccount()) { return response('Done.', 204); } diff --git a/src/Domain/Teams/Controllers/TeamFoldersController.php b/src/Domain/Teams/Controllers/TeamFoldersController.php index cc3f20f0..955be76d 100644 --- a/src/Domain/Teams/Controllers/TeamFoldersController.php +++ b/src/Domain/Teams/Controllers/TeamFoldersController.php @@ -65,7 +65,7 @@ class TeamFoldersController extends Controller CreateTeamFolderRequest $request, ): ResponseFactory | Response { // Abort in demo mode - abort_if(is_demo_account(), 201, 'Done.'); + abort_if(isDemoAccount(), 201, 'Done.'); $data = CreateTeamFolderData::fromRequest($request); @@ -112,7 +112,7 @@ class TeamFoldersController extends Controller UpdateMembersAction $updateMembers, ): ResponseFactory | Response { // Abort in demo mode - if (is_demo_account()) { + if (isDemoAccount()) { return response(new FolderResource($folder), 201); } @@ -143,7 +143,7 @@ class TeamFoldersController extends Controller public function destroy(Folder $folder): ResponseFactory | Response { // Abort in demo mode - if (is_demo_account()) { + if (isDemoAccount()) { return response('Done.', 201); } diff --git a/src/Domain/Trash/Controllers/DumpTrashController.php b/src/Domain/Trash/Controllers/DumpTrashController.php index e8a11e83..7d8df7a4 100644 --- a/src/Domain/Trash/Controllers/DumpTrashController.php +++ b/src/Domain/Trash/Controllers/DumpTrashController.php @@ -16,7 +16,7 @@ class DumpTrashController extends Controller 'message' => 'The trash was successfully dumped.', ]; - if (is_demo_account()) { + if (isDemoAccount()) { return response()->json($successMessage); } diff --git a/src/Domain/Trash/Controllers/RestoreTrashContentController.php b/src/Domain/Trash/Controllers/RestoreTrashContentController.php index 377fe373..1ce18f4e 100644 --- a/src/Domain/Trash/Controllers/RestoreTrashContentController.php +++ b/src/Domain/Trash/Controllers/RestoreTrashContentController.php @@ -15,7 +15,7 @@ class RestoreTrashContentController extends Controller 'message' => 'The item was successfully restored.', ]; - if (is_demo_account()) { + if (isDemoAccount()) { return response()->json($successMessage); } diff --git a/src/Support/helpers.php b/src/Support/helpers.php index ff86f4f0..cfa0c6d2 100644 --- a/src/Support/helpers.php +++ b/src/Support/helpers.php @@ -328,11 +328,11 @@ if (! function_exists('is_demo')) { } } -if (! function_exists('is_demo_account')) { +if (! function_exists('isDemoAccount')) { /** * Check if is demo environment */ - function is_demo_account(): bool + function isDemoAccount(): bool { return config('vuefilemanager.is_demo') && auth()->user()->email === 'howdy@hi5ve.digital'; }