fix wrong atom config fetch body keynames

penwern · Aug 14, 2024 · 04562cf · 04562cf
1 parent f3c5f95
commit 04562cf
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/dist/4.4.1/main_4.4.1.js b/dist/4.4.1/main_4.4.1.js
diff --git a/src/js/core/CustomPreservationConfigs.js b/src/js/core/CustomPreservationConfigs.js
@@ -1,6 +1,6 @@
   async function submitPreservationRequest(configId) {
         const token = await PydioApi._PydioRestClient.getOrUpdateJwt();
-        const url = `${window.location.protocol}//${window.location.hostname}/a/scheduler/hooks/a3m-transfer`;
+        const url = `${window.location.origin}/a/scheduler/hooks/a3m-transfer`;
         const paths = pydio._dataModel._selectedNodes.map(n => ({
             path: Curate.workspaces.getOpenWorkspace() + n._path,
             slug: n._metadata.get("usermeta-atom-linked-description") || ""
@@ -43,7 +43,7 @@
     // Retrieves saved preservation configs from the server at route GET /api/preservation
     // Stores the configs in sessionStorage under the key "preservationConfigs"
     async function getPreservationConfigs() {
-        const url = `${window.location.protocol}//${window.location.hostname}/api/preservation`;
+        const url = `${window.location.origin}/api/preservation`;
         const token = await PydioApi._PydioRestClient.getOrUpdateJwt();
         return fetch(url, {headers: {"Authorization": `Bearer ${token}`}, method: "GET"})
             .then(response => {
@@ -743,7 +743,7 @@
         }
     }
     async function deletePreservationConfig(id) {
-        const url = `${window.location.protocol}//${window.location.hostname}/preservation/${id}`;
+        const url = `${window.location.origin}/preservation/${id}`;
         const token = await PydioApi._PydioRestClient.getOrUpdateJwt();
         return fetch(url, {
             method: "DELETE",
@@ -775,7 +775,7 @@
     }
     // Saves the given preservation config to the server at route POST /preservation
     async function setPreservationConfig(config) {
-        const url = `${window.location.protocol}//${window.location.hostname}/preservation`;
+        const url = `${window.location.origin}/preservation`;
         const token = await PydioApi._PydioRestClient.getOrUpdateJwt();
         return fetch(url, {
             method: "POST",
@@ -805,7 +805,7 @@
         return input.replaceAll(" ", "_");
     }
     async function editPreservationConfig(config) {
-        const url = `${window.location.protocol}//${window.location.hostname}/api/preservation/${config.id}`;
+        const url = `${window.location.origin}/api/preservation/${config.id}`;
         const token = await PydioApi._PydioRestClient.getOrUpdateJwt();
         return fetch(url, {
             method: "POST",

diff --git a/src/js/vanitizer/PreservationConfigsPopup.js b/src/js/vanitizer/PreservationConfigsPopup.js
@@ -211,7 +211,7 @@ function createCuratePopup(title, inputs) {
 
 }
 async function getPreservationConfigs() {
-    const url = `${window.location.protocol}//${window.location.hostname}/api/preservation`;
+    const url = `${window.location.origin}/api/preservation`;
     const token = await PydioApi._PydioRestClient.getOrUpdateJwt();
     return fetch(url, {
         method: 'GET',
@@ -234,7 +234,7 @@ async function getPreservationConfigs() {
         });
 }
 async function editPreservationConfig(config) {
-    const url = `${window.location.protocol}//${window.location.hostname}/api/preservation/${config.id}`;
+    const url = `${window.location.origin}/api/preservation/${config.id}`;
     const token = await PydioApi._PydioRestClient.getOrUpdateJwt();
     return fetch(url, {
         method: "POST",
@@ -260,7 +260,7 @@ async function editPreservationConfig(config) {
         });
     }
 async function setPreservationConfig(config) {
-    const url = `${window.location.protocol}//${window.location.hostname}/api/preservation`;
+    const url = `${window.location.origin}/api/preservation`;
     const token = await PydioApi._PydioRestClient.getOrUpdateJwt();
     return fetch(url, {
         method: "POST",
@@ -286,7 +286,7 @@ async function setPreservationConfig(config) {
     });
 }
 async function deletePreservationConfig(id) {
-    const url = `${window.location.protocol}//${window.location.hostname}/api/preservation/${id}`;
+    const url = `${window.location.origin}/api/preservation/${id}`;
     const token = await PydioApi._PydioRestClient.getOrUpdateJwt();
     return fetch(url, {
         method: "DELETE",

diff --git a/src/js/web-components/atom-connector.js b/src/js/web-components/atom-connector.js
@@ -26,10 +26,10 @@ class ConnectToAtom extends HTMLElement {
   saveDetails(e) {
     e.preventDefault();
     Curate.api.fetchCurate('/api/atom', 'POST', {
-      api_key: this.apiKey,
+      atom_api_key: this.apiKey,
       atom_url: this.atomUrl,
-      username: this.username,
-      password: this.password
+      atom_username: this.username,
+      atom_password: this.password
     })
       .then(response => {
         console.log('Saved Atom details:', response);