diff --git a/.yarn/cache/@mittwald-api-client-commons-npm-4.416.0-851da2abbf-b45aa75538.zip b/.yarn/cache/@mittwald-api-client-commons-npm-4.420.0-3d76a7b411-482fef1cf5.zip similarity index 88% rename from .yarn/cache/@mittwald-api-client-commons-npm-4.416.0-851da2abbf-b45aa75538.zip rename to .yarn/cache/@mittwald-api-client-commons-npm-4.420.0-3d76a7b411-482fef1cf5.zip index 3e9fd4d4e..f83c7229a 100644 Binary files a/.yarn/cache/@mittwald-api-client-commons-npm-4.416.0-851da2abbf-b45aa75538.zip and b/.yarn/cache/@mittwald-api-client-commons-npm-4.420.0-3d76a7b411-482fef1cf5.zip differ diff --git a/.yarn/cache/@mittwald-api-client-npm-4.416.0-78c6a02626-d22a591688.zip b/.yarn/cache/@mittwald-api-client-npm-4.416.0-78c6a02626-d22a591688.zip deleted file mode 100644 index 78e358baf..000000000 Binary files a/.yarn/cache/@mittwald-api-client-npm-4.416.0-78c6a02626-d22a591688.zip and /dev/null differ diff --git a/.yarn/cache/@mittwald-api-client-npm-4.420.0-a07322bb2f-26e60dc7a8.zip b/.yarn/cache/@mittwald-api-client-npm-4.420.0-a07322bb2f-26e60dc7a8.zip new file mode 100644 index 000000000..d26037072 Binary files /dev/null and b/.yarn/cache/@mittwald-api-client-npm-4.420.0-a07322bb2f-26e60dc7a8.zip differ diff --git a/src/commands/database/mysql/user/update.tsx b/src/commands/database/mysql/user/update.tsx index a56b1128f..f778d3dc8 100644 --- a/src/commands/database/mysql/user/update.tsx +++ b/src/commands/database/mysql/user/update.tsx @@ -10,9 +10,9 @@ import assertSuccess from "../../../../lib/apiutil/assert_success.js"; import type { MittwaldAPIV2Client } from "@mittwald/api-client"; import { mysqlUserFlagDefinitions } from "../../../../lib/resources/database/mysql/user/flags.js"; type UpdateResult = void; -type MyQSLUserUpdateData = Parameters< - MittwaldAPIV2Client["database"]["updateMysqlUser"] ->[0]["data"]; +type MyQSLUserUpdateData = NonNullable< + Parameters[0]["data"] +>; export default class Update extends ExecRenderBaseCommand< typeof Update, @@ -82,7 +82,7 @@ export default class Update extends ExecRenderBaseCommand< .externalAccess as boolean; } - const updateMysqlUserPayload: Required = { + const updateMysqlUserPayload: MyQSLUserUpdateData = { accessLevel: accessLevel == "full" || accessLevel == "readonly" ? accessLevel @@ -95,25 +95,13 @@ export default class Update extends ExecRenderBaseCommand< ? accessIpMask : (currentMysqlUserData.data.accessIpMask as string), externalAccess: externalAccessActive, + ...(password ? { password } : {}), }; - if (password) { - changesNecessary = true; - await process.runStep("Updating MySQL user password", async () => { - const updatePasswordResponse = - await this.apiClient.database.updateMysqlUserPassword({ - mysqlUserId, - data: { - password, - }, - }); - assertSuccess(updatePasswordResponse); - }); - } - if ( accessLevel || description || + password || accessIpMask || enableExternalAccess || disableExternalAccess diff --git a/yarn.lock b/yarn.lock index 416b56e3d..21a593338 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1870,9 +1870,9 @@ __metadata: languageName: node linkType: hard -"@mittwald/api-client-commons@npm:^4.416.0": - version: 4.416.0 - resolution: "@mittwald/api-client-commons@npm:4.416.0" +"@mittwald/api-client-commons@npm:^4.420.0": + version: 4.420.0 + resolution: "@mittwald/api-client-commons@npm:4.420.0" dependencies: "@types/parse-path": ^7.0.3 axios: ^1.15.2 @@ -1886,22 +1886,22 @@ __metadata: optional: true "@mittwald/react-use-promise": optional: true - checksum: b45aa75538a70a44f5fd9411a539c8802d5d04fceab2bc7609e52749bb4d92878a8bec449e85969c7889db6dd48838634a2c3a090210a039185ff5ad1529bb68 + checksum: 482fef1cf51e070837514a0c3e1c88a26f7d7815c4d8a1c801d8ec6b80edabb19691b5bdfbfe71b6141b693d047b98e7030c79d709485c7fa260e00b56225568 languageName: node linkType: hard "@mittwald/api-client@npm:^4.400.0": - version: 4.416.0 - resolution: "@mittwald/api-client@npm:4.416.0" + version: 4.420.0 + resolution: "@mittwald/api-client@npm:4.420.0" dependencies: - "@mittwald/api-client-commons": ^4.416.0 + "@mittwald/api-client-commons": ^4.420.0 browser-or-node: ^3.0.0 peerDependencies: "@mittwald/react-use-promise": ^2.6.0 peerDependenciesMeta: "@mittwald/react-use-promise": optional: true - checksum: d22a591688605aa3d536678df0f3b4708ec216edd3519f6faff417d1ac4a275b35498d4a303a8080f82e74d36e41042ecab1bb605c38a72701ea7a1404e55ce1 + checksum: 26e60dc7a849646145374e5da813c6459cd32f46389f8b8ce102cb8cc9029cf35f8b8f02a342da53d821cd97e41e29051ea3e73e2515b3dad142dd140b8d7b83 languageName: node linkType: hard