@pronto-tools-and-more/network-process 3.16.0 → 4.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pronto-tools-and-more/network-process",
-  "version": "3.16.0",
+  "version": "4.0.0",
   "description": "",
   "main": "src/networkProcessMain.js",
   "type": "module",

package/src/parts/Login/Login.js

@@ -1,24 +1,22 @@
 import { VError } from "@lvce-editor/verror";
 import ky from "ky";
 import * as Assert from "../Assert/Assert.js";
-import * as GetXr from "../GetXr/GetXr.js";
 
-const getBodyJson = (userEmail, userPassword) => {
+const getBodyFormData = (userEmail, userPassword) => {
   Assert.string(userEmail);
   Assert.string(userPassword);
-  return {
-    email: userEmail,
-    password: userPassword,
-    permanent: true,
-  };
+  const formData = new URLSearchParams();
+  formData.set("client_id", "experience-builder");
+  formData.set("grant_type", "password");
+  formData.set("scope", "openid");
+  formData.set("username", userEmail);
+  formData.set("password", userPassword);
+  return formData;
 };
 
 const getHeaders = () => {
-  const xr = GetXr.getXr();
   return {
-    accept: "*/*",
-    "content-type": "application/json",
-    xr,
+    "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
   };
 };
 
@@ -30,19 +28,26 @@ const getHeaders = () => {
 export const login = async ({ loginUrl, userEmail, userPassword }) => {
   try {
     Assert.string(loginUrl);
-    const body = getBodyJson(userEmail, userPassword);
+    const body = getBodyFormData(userEmail, userPassword);
     const headers = getHeaders();
     const response = await ky(loginUrl, {
-      json: body,
+      body,
       method: "post",
       headers,
     });
-    return response.json();
+    const result = await response.json();
+    console.log({ result });
+    return result;
   } catch (error) {
     // @ts-ignore
     if (error && error.name === "HTTPError") {
       // @ts-ignore
       const serverMessage = await error.response.text();
+      if (serverMessage.includes("Cannot POST /api/user/login")) {
+        throw new Error(
+          `Failed to login: Unable to login due to breaking api changes in the backend (see https://purplepublish.atlassian.net/browse/BACKEND-5178)`
+        );
+      }
       if (serverMessage === "INTERNAL_ERROR") {
         throw new Error("Failed to login: Internal error. Hint: Check headers");
       }