fix: openapi

Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>

12 files changed, 23 insertions, 22 deletions

diff --git a/apps/dav/openapi.json b/apps/dav/openapi.json
index a0df1cedd16..6200fbafb4f 100644
--- a/apps/dav/openapi.json
+++ b/apps/dav/openapi.json
@@ -268,7 +268,7 @@
         "/ocs/v2.php/apps/dav/api/v1/outOfOffice/{userId}/now": {
             "get": {
                 "operationId": "out_of_office-get-current-out-of-office-data",
-                "summary": "Get the currently configured out-of-office data of a user.",
+                "summary": "Get the currently configured out-of-office data of a user",
                 "tags": [
                     "out_of_office"
                 ],
diff --git a/apps/federation/openapi.json b/apps/federation/openapi.json
index fe72b2d133d..71e72dbec92 100644
--- a/apps/federation/openapi.json
+++ b/apps/federation/openapi.json
@@ -3,7 +3,7 @@
     "info": {
         "title": "federation",
         "version": "0.0.1",
-        "description": "Federation allows you to connect with other trusted servers to exchange the user directory.",
+        "description": "Federation allows you to connect with other trusted servers to exchange the account directory.",
         "license": {
             "name": "agpl"
         }
diff --git a/apps/files_reminders/lib/Controller/ApiController.php b/apps/files_reminders/lib/Controller/ApiController.php
index 91b7e51eb6f..aeac3bd7a6b 100644
--- a/apps/files_reminders/lib/Controller/ApiController.php
+++ b/apps/files_reminders/lib/Controller/ApiController.php
@@ -59,7 +59,7 @@ class ApiController extends OCSController {
 	 * @return DataResponse<Http::STATUS_OK, array{dueDate: ?string}, array{}>|DataResponse<Http::STATUS_UNAUTHORIZED, array<empty>, array{}>
 	 *
 	 * 200: Reminder returned
-	 * 401: User not found
+	 * 401: Account not found
 	 */
 	#[NoAdminRequired]
 	public function get(int $fileId): DataResponse {
@@ -93,7 +93,7 @@ class ApiController extends OCSController {
 	 * 200: Reminder updated
 	 * 201: Reminder created successfully
 	 * 400: Creating reminder is not possible
-	 * 401: User not found
+	 * 401: Account not found
 	 * 404: File not found
 	 */
 	#[NoAdminRequired]
@@ -129,7 +129,7 @@ class ApiController extends OCSController {
 	 * @return DataResponse<Http::STATUS_OK|Http::STATUS_UNAUTHORIZED|Http::STATUS_NOT_FOUND, array<empty>, array{}>
 	 *
 	 * 200: Reminder deleted successfully
-	 * 401: User not found
+	 * 401: Account not found
 	 * 404: Reminder not found
 	 */
 	#[NoAdminRequired]
diff --git a/apps/files_reminders/openapi.json b/apps/files_reminders/openapi.json
index 67135e57cc1..4e9653b2f0b 100644
--- a/apps/files_reminders/openapi.json
+++ b/apps/files_reminders/openapi.json
@@ -134,7 +134,7 @@
                         }
                     },
                     "401": {
-                        "description": "User not found",
+                        "description": "Account not found",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -303,7 +303,7 @@
                         }
                     },
                     "401": {
-                        "description": "User not found",
+                        "description": "Account not found",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -435,7 +435,7 @@
                         }
                     },
                     "401": {
-                        "description": "User not found",
+                        "description": "Account not found",
                         "content": {
                             "application/json": {
                                 "schema": {
diff --git a/apps/files_trashbin/openapi.json b/apps/files_trashbin/openapi.json
index afa0ccfdafd..2103047c282 100644
--- a/apps/files_trashbin/openapi.json
+++ b/apps/files_trashbin/openapi.json
@@ -3,7 +3,7 @@
     "info": {
         "title": "files_trashbin",
         "version": "0.0.1",
-        "description": "This application enables users to restore files that were deleted from the system.",
+        "description": "This application enables people to restore files that were deleted from the system.",
         "license": {
             "name": "agpl"
         }
diff --git a/apps/provisioning_api/openapi-administration.json b/apps/provisioning_api/openapi-administration.json
index ea8a5cdc546..9104c76ab42 100644
--- a/apps/provisioning_api/openapi-administration.json
+++ b/apps/provisioning_api/openapi-administration.json
@@ -3,7 +3,7 @@
     "info": {
         "title": "provisioning_api-administration",
         "version": "0.0.1",
-        "description": "This application enables a set of APIs that external systems can use to manage users, groups and apps.",
+        "description": "This application enables a set of APIs that external systems can use to manage accounts, groups and apps.",
         "license": {
             "name": "agpl"
         }
diff --git a/apps/provisioning_api/openapi-full.json b/apps/provisioning_api/openapi-full.json
index d7fbec5569e..20746bbf769 100644
--- a/apps/provisioning_api/openapi-full.json
+++ b/apps/provisioning_api/openapi-full.json
@@ -3,7 +3,7 @@
     "info": {
         "title": "provisioning_api-full",
         "version": "0.0.1",
-        "description": "This application enables a set of APIs that external systems can use to manage users, groups and apps.",
+        "description": "This application enables a set of APIs that external systems can use to manage accounts, groups and apps.",
         "license": {
             "name": "agpl"
         }
diff --git a/apps/provisioning_api/openapi.json b/apps/provisioning_api/openapi.json
index e26adfc2d0a..e5e184194b9 100644
--- a/apps/provisioning_api/openapi.json
+++ b/apps/provisioning_api/openapi.json
@@ -3,7 +3,7 @@
     "info": {
         "title": "provisioning_api",
         "version": "0.0.1",
-        "description": "This application enables a set of APIs that external systems can use to manage users, groups and apps.",
+        "description": "This application enables a set of APIs that external systems can use to manage accounts, groups and apps.",
         "license": {
             "name": "agpl"
         }
diff --git a/apps/systemtags/openapi.json b/apps/systemtags/openapi.json
index 691717c6484..e27985c441d 100644
--- a/apps/systemtags/openapi.json
+++ b/apps/systemtags/openapi.json
@@ -3,7 +3,7 @@
     "info": {
         "title": "systemtags",
         "version": "0.0.1",
-        "description": "Collaborative tagging functionality which shares tags among users.",
+        "description": "Collaborative tagging functionality which shares tags among people.",
         "license": {
             "name": "agpl"
         }
diff --git a/core/Controller/HoverCardController.php b/core/Controller/HoverCardController.php
index 9a76ee4a09a..ac1b809ba0c 100644
--- a/core/Controller/HoverCardController.php
+++ b/core/Controller/HoverCardController.php
@@ -48,13 +48,13 @@ class HoverCardController extends \OCP\AppFramework\OCSController {
 	/**
 	 * @NoAdminRequired
 	 *
-	 * Get the user details for a hovercard
+	 * Get the account details for a hovercard
 	 *
 	 * @param string $userId ID of the user
 	 * @return DataResponse<Http::STATUS_OK, array{userId: string, displayName: string, actions: CoreContactsAction[]}, array{}>|DataResponse<Http::STATUS_NOT_FOUND, array<empty>, array{}>
 	 *
-	 * 200: User details returned
-	 * 404: User not found
+	 * 200: Account details returned
+	 * 404: Account not found
 	 */
 	public function getUser(string $userId): DataResponse {
 		$contact = $this->manager->findOne($this->userSession->getUser(), IShare::TYPE_USER, $userId);
diff --git a/core/openapi.json b/core/openapi.json
index 52e684ee729..784cce560cd 100644
--- a/core/openapi.json
+++ b/core/openapi.json
@@ -2421,7 +2421,7 @@
         "/ocs/v2.php/hovercard/v1/{userId}": {
             "get": {
                 "operationId": "hover_card-get-user",
-                "summary": "Get the user details for a hovercard",
+                "summary": "Get the account details for a hovercard",
                 "tags": [
                     "hover_card"
                 ],
@@ -2456,7 +2456,7 @@
                 ],
                 "responses": {
                     "200": {
-                        "description": "User details returned",
+                        "description": "Account details returned",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -2505,7 +2505,7 @@
                         }
                     },
                     "404": {
-                        "description": "User not found",
+                        "description": "Account not found",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -4001,7 +4001,7 @@
                         }
                     },
                     "404": {
-                        "description": "User not found",
+                        "description": "Account not found",
                         "content": {
                             "text/plain": {
                                 "schema": {
diff --git a/lib/private/Setup.php b/lib/private/Setup.php
index 5bfb64cb513..c190a47b53f 100644
--- a/lib/private/Setup.php
+++ b/lib/private/Setup.php
@@ -366,8 +366,9 @@ class Setup {
 		}
 
 		$this->outputDebug($output, 'Create admin account');
-		//create the  and group
-		$ = null;
+
+		// create the admin account and group
+		$user = null;
 		try {
 			$user = Server::get(IUserManager::class)->createUser($username, $password);
 			if (!$user) {