sts-sponsors team mailing list archive

[Thorsten Merten <mp+441781@xxxxxxxxxxxxxxxxxx>]

Thorsten Merten has proposed merging ~thorsten-merten/maas-site-manager:change-login-to-send-json into maas-site-manager:main.

Commit message:
refactor: change login credentials

change test data to be compatible with backend test data.
This way the playwright test succeeds against the mock and real
backends.

Also simplify login handler code.



Requested reviews:
  MAAS Lander (maas-lander)
  Peter Makowski (petermakowski)

For more details, see:
https://code.launchpad.net/~thorsten-merten/maas-site-manager/+git/maas-site-manager/+merge/441781
-- 
Your team MAAS Committers is subscribed to branch ~thorsten-merten/maas-site-manager:change-login-to-send-json.

diff --git a/frontend/src/api/handlers.ts b/frontend/src/api/handlers.ts
index a8b7dc9..606c732 100644
--- a/frontend/src/api/handlers.ts
+++ b/frontend/src/api/handlers.ts
@@ -15,10 +15,7 @@ export const postLogin = async (data: PostLoginData) => {
     throw Error("Missing required fields");
   }
   try {
-    const response = await api.post(urls.login, {
-      username: data.username,
-      password: data.password,
-    });
+    const response = await api.post(urls.login, data);
     return response.data;
   } catch (error) {
     throw error;
diff --git a/frontend/src/mocks/resolvers.ts b/frontend/src/mocks/resolvers.ts
index 385d828..8ccf198 100644
--- a/frontend/src/mocks/resolvers.ts
+++ b/frontend/src/mocks/resolvers.ts
@@ -19,7 +19,7 @@ const accessToken = accessTokenFactory.build();
 export const createMockLoginResolver =
   (): ResponseResolver<RestRequest<any, any>, typeof restContext> => async (req, res, ctx) => {
     const { username, password } = await req.body;
-    if (username === "admin" && password === "test") {
+    if (username === "admin@xxxxxxxxxxx" && password === "admin") {
       return res(ctx.json(accessToken));
     }
     return res(
diff --git a/frontend/tests/auth.setup.ts b/frontend/tests/auth.setup.ts
index 04d7cb9..b469d4e 100644
--- a/frontend/tests/auth.setup.ts
+++ b/frontend/tests/auth.setup.ts
@@ -4,8 +4,8 @@ import { adminAuthFile } from "./constants";
 
 setup("authenticate", async ({ page }) => {
   await page.goto(routesConfig.login.path);
-  await page.getByRole("textbox", { name: "Username" }).type("admin");
-  await page.getByRole("textbox", { name: "Password" }).type("test");
+  await page.getByRole("textbox", { name: "Username" }).type("admin@xxxxxxxxxxx");
+  await page.getByRole("textbox", { name: "Password" }).type("admin");
   await page.getByRole("button", { name: "Login" }).click();
   await expect(page.getByRole("link", { name: "Log out" })).toBeVisible();
   await page.context().storageState({ path: adminAuthFile });
diff --git a/frontend/tests/constants.ts b/frontend/tests/constants.ts
index be2a7c7..7634bd8 100644
--- a/frontend/tests/constants.ts
+++ b/frontend/tests/constants.ts
@@ -1,5 +1,5 @@
 export const admin = {
-  username: "admin",
-  password: "test",
+  username: "admin@xxxxxxxxxxx",
+  password: "admin",
 };
 export const adminAuthFile = "tests/.auth/admin.json";