Skip to content

Commit 867dbf3

Browse files
committed
Update all the client API endpoints to use new permissions codes
1 parent 1153101 commit 867dbf3

32 files changed

+141
-1187
lines changed

app/Http/Controllers/Api/Client/Servers/WebsocketController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function __construct(Repository $cache)
4545
*/
4646
public function __invoke(Request $request, Server $server)
4747
{
48-
if (! $request->user()->can('connect-to-ws', $server)) {
48+
if (! $request->user()->can('websocket.*', $server)) {
4949
throw new HttpException(
5050
Response::HTTP_FORBIDDEN, 'You do not have permission to connect to this server\'s websocket.'
5151
);

app/Http/Requests/Api/Client/Servers/Databases/DeleteDatabaseRequest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class DeleteDatabaseRequest extends ClientApiRequest implements ClientPermission
1414
*/
1515
public function permission(): string
1616
{
17-
return 'delete-database';
17+
return 'database.delete';
1818
}
1919

2020
/**

app/Http/Requests/Api/Client/Servers/Databases/GetDatabasesRequest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ class GetDatabasesRequest extends ClientApiRequest implements ClientPermissionsR
1212
*/
1313
public function permission(): string
1414
{
15-
return 'view-databases';
15+
return 'database.read';
1616
}
1717
}

app/Http/Requests/Api/Client/Servers/Databases/RotatePasswordRequest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ class RotatePasswordRequest extends ClientApiRequest
1414
*/
1515
public function authorize(): bool
1616
{
17-
return $this->user()->can('reset-db-password', $this->getModel(Server::class));
17+
return $this->user()->can('database.update', $this->getModel(Server::class));
1818
}
1919
}

app/Http/Requests/Api/Client/Servers/Databases/StoreDatabaseRequest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class StoreDatabaseRequest extends ClientApiRequest implements ClientPermissions
1212
*/
1313
public function permission(): string
1414
{
15-
return 'create-database';
15+
return 'database.create';
1616
}
1717

1818
/**

app/Http/Requests/Api/Client/Servers/Files/CopyFileRequest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class CopyFileRequest extends ClientApiRequest implements ClientPermissionsReque
1212
*/
1313
public function permission(): string
1414
{
15-
return 'copy-files';
15+
return 'file.create';
1616
}
1717

1818
/**

app/Http/Requests/Api/Client/Servers/Files/CreateFolderRequest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class CreateFolderRequest extends ClientApiRequest
1414
*/
1515
public function authorize(): bool
1616
{
17-
return $this->user()->can('create-files', $this->getModel(Server::class));
17+
return $this->user()->can('file.create', $this->getModel(Server::class));
1818
}
1919

2020
/**

app/Http/Requests/Api/Client/Servers/Files/DeleteFileRequest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class DeleteFileRequest extends ClientApiRequest implements ClientPermissionsReq
1212
*/
1313
public function permission(): string
1414
{
15-
return 'delete-files';
15+
return 'file.delete';
1616
}
1717

1818
/**

app/Http/Requests/Api/Client/Servers/Files/DownloadFileRequest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ class DownloadFileRequest extends ClientApiRequest
1515
*/
1616
public function authorize(): bool
1717
{
18-
return $this->user()->can('download-files', $this->getModel(Server::class));
18+
return $this->user()->can('file.read', $this->getModel(Server::class));
1919
}
2020
}

app/Http/Requests/Api/Client/Servers/Files/GetFileContentsRequest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class GetFileContentsRequest extends ClientApiRequest implements ClientPermissio
1616
*/
1717
public function permission(): string
1818
{
19-
return 'edit-files';
19+
return 'file.read';
2020
}
2121

2222
/**

0 commit comments

Comments
 (0)