From 410d8700e4555c414b50f19b0d626758e030ce2b Mon Sep 17 00:00:00 2001
From: Pedro Silva <pedro@budibase.com>
Date: Mon, 5 Jun 2023 18:42:44 +0100
Subject: [PATCH 1/2] Add more tests for user settings

---
 qa-core/src/internal-api/api/apis/SelfAPI.ts   | 18 +++++++++++++++---
 .../tests/users/userManagement.spec.ts         | 16 ++++++++++++++++
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/qa-core/src/internal-api/api/apis/SelfAPI.ts b/qa-core/src/internal-api/api/apis/SelfAPI.ts
index cd162053a1..022a438249 100644
--- a/qa-core/src/internal-api/api/apis/SelfAPI.ts
+++ b/qa-core/src/internal-api/api/apis/SelfAPI.ts
@@ -14,10 +14,11 @@ export default class SelfAPI extends BaseAPI {
     return [response, json]
   }
 
-  async changeSelfPassword(body: Partial<User>): Promise<[Response, User]> {
+  async changeSelfPassword(): Promise<[Response, User]> {
+    const body = {
+      password: "newPassword",
+    }
     const [response, json] = await this.post(`/global/self`, body)
-    expect(json._id).toEqual(body._id)
-    expect(json._rev).not.toEqual(body._rev)
     return [response, json]
   }
 
@@ -26,4 +27,15 @@ export default class SelfAPI extends BaseAPI {
     expect(json).toHaveProperty("apiKey")
     return json
   }
+
+  async changeUserInfo(body: Partial<User>): Promise<[Response, User]> {
+    const [response, json] = await this.post(`/global/self`, body)
+    return [response, json]
+  }
+
+  async generateApiKey(): Promise<[Response, ApiKeyResponse]> {
+    const [response, json] = await this.post(`/global/self/api_key`)
+    expect(json).toHaveProperty("apiKey")
+    return [response, json]
+  }
 }
diff --git a/qa-core/src/internal-api/tests/users/userManagement.spec.ts b/qa-core/src/internal-api/tests/users/userManagement.spec.ts
index 28096c08c9..d1bada05c0 100644
--- a/qa-core/src/internal-api/tests/users/userManagement.spec.ts
+++ b/qa-core/src/internal-api/tests/users/userManagement.spec.ts
@@ -87,4 +87,20 @@ describe("Internal API - User Management & Permissions", () => {
     expect(changedUserInfoJson.builder?.global).toBeDefined()
     expect(changedUserInfoJson.builder?.global).toEqual(true)
   })
+
+  it("Set First and Last Name", async () => {
+    const body: Partial<User> = {
+      firstName: "newFirstName",
+      lastName: "newLastName",
+    }
+    await config.api.self.changeUserInfo(body)
+  })
+
+  it("Generate API key", async () => {
+    await config.api.self.generateApiKey()
+  })
+
+  it("Change Password", async () => {
+    await config.api.self.changeSelfPassword()
+  })
 })

From 0aa3e19d095b1623972e3c269e0fa332c7d5cdd7 Mon Sep 17 00:00:00 2001
From: Pedro Silva <pedro@budibase.com>
Date: Fri, 9 Jun 2023 12:44:31 +0100
Subject: [PATCH 2/2] Add verifications

---
 .../src/internal-api/tests/users/userManagement.spec.ts  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/qa-core/src/internal-api/tests/users/userManagement.spec.ts b/qa-core/src/internal-api/tests/users/userManagement.spec.ts
index d1bada05c0..42bda21102 100644
--- a/qa-core/src/internal-api/tests/users/userManagement.spec.ts
+++ b/qa-core/src/internal-api/tests/users/userManagement.spec.ts
@@ -94,6 +94,11 @@ describe("Internal API - User Management & Permissions", () => {
       lastName: "newLastName",
     }
     await config.api.self.changeUserInfo(body)
+
+    const [changedUserInfoResponse, changedUserInfoJson] =
+      await config.api.self.getSelf()
+    expect(changedUserInfoJson.firstName).toEqual("newFirstName")
+    expect(changedUserInfoJson.lastName).toEqual("newLastName")
   })
 
   it("Generate API key", async () => {
@@ -102,5 +107,9 @@ describe("Internal API - User Management & Permissions", () => {
 
   it("Change Password", async () => {
     await config.api.self.changeSelfPassword()
+    const [changedUserInfoResponse, changedUserInfoJson] =
+      await config.api.self.getSelf()
+
+    await config.login(changedUserInfoJson.email!, "newPassword")
   })
 })