@klauswuestefeld/jux-web 2024.2.7 → 2024.2.8

package/dist/api-client.d.ts

@@ -1,4 +1,5 @@
 export declare const setBackendUrl: (backendUrl: string) => void;
+export declare const getBackendUrl: () => string;
 export declare const handleJuxEvents: (ev: Event) => void;
 export declare const backendRequest: (requestType: string, urlString: string, params: any, onJsonResponse: (response: any) => any, onHelpMessage: (message: string) => any, handleUnauthorized?: () => void) => void;
 export declare const backendPost: (endpoint: string, postContent: any, onJsonResponse: (response: any) => any, onHelpMessage: (message: string) => any) => void;

package/dist/jux-web.js

@@ -158,16 +158,12 @@ var juxWeb = (function (exports) {
       const endpoint = ((_a = window === null || window === void 0 ? void 0 : window.store) === null || _a === void 0 ? void 0 : _a.magicLinkRequestEndpoint) || 'magic-link-request';
       return getBackendUrl() + endpoint + '?email=';
   };
+  // TODO: use jux-events to call commands and queries inside jux-web library
   const handleJuxEvents = (ev) => {
-      const { method, endpoint, onResult, params, onError } = ev;
+      const { endpoint, onResult, params, onError } = ev;
       const onJsonResponse = (res) => onResult ? onResult(res) : null;
       const onHelpMessage = (err) => onError ? onError(err) : null;
-      if (method === 'GET') {
-          backendGet(endpoint, params, onJsonResponse, onHelpMessage);
-      }
-      if (method === 'POST') {
-          backendPost(endpoint, params, onJsonResponse, onHelpMessage);
-      }
+      backendPost(endpoint, params, onJsonResponse, onHelpMessage);
   };
   let timeout;
   const maxRetries = 20;
@@ -267,7 +263,8 @@ var juxWeb = (function (exports) {
       req.send(params);
   };
   const backendPost = (endpoint, postContent, onJsonResponse, onHelpMessage) => {
-      backendRequest('POST', getApiUrl() + endpoint, postContent, onJsonResponse, onHelpMessage);
+      const params = JSON.stringify(postContent);
+      backendRequest('POST', getApiUrl() + endpoint, params, onJsonResponse, onHelpMessage);
   };
   const backendGet = (endpoint, params, onJsonResponse, onHelpMessage) => {
       backendRequest('GET', getApiUrl() + endpoint, params, onJsonResponse, onHelpMessage);
@@ -14046,7 +14043,7 @@ var juxWeb = (function (exports) {
 <strong>Message</strong>: ${getNestedElValue(msg, 'textarea')}`,
           token,
       };
-      backendPost('contact-us', JSON.stringify(inquiryPayload), (_res) => {
+      backendPost('contact-us', inquiryPayload, (_res) => {
           var _a;
           // success(getTranslation('form-success'), Length.long);
           (_a = document.querySelector('#contact-us-modal')) === null || _a === void 0 ? void 0 : _a.remove();
@@ -14081,7 +14078,7 @@ var juxWeb = (function (exports) {
       if (subject !== 'email-not-sent') {
           // @ts-ignore
           const admin = ((_d = (_c = window.store) === null || _c === void 0 ? void 0 : _c.selectedTeam) === null || _d === void 0 ? void 0 : _d.admin) || window.store.currentUser.email;
-          backendGet(`credits-balance-for?admin=${admin}`, null, (res) => {
+          backendGet('credits-balance-for', { admin }, (res) => {
               const balance = res;
               if (balance <= 0) {
                   form.insertBefore(captcha, btn);
@@ -14233,7 +14230,10 @@ var juxWeb = (function (exports) {
   };
   const clearSession = () => {
       // onUserChanged(null);
+      // TODO: find a better way to preserve backend-url
+      const backendUrl = getBackendUrl(); // Preserve backend, since the authentication was succcessfull
       localStorage.clear();
+      setBackendUrl(backendUrl);
       // @ts-ignore
       window.store = {};
   };
@@ -14259,10 +14259,6 @@ var juxWeb = (function (exports) {
       Array.from(clientApp.children).forEach(el => el.remove());
       clientApp.appendChild(page);
   };
-  const setJuxEventHandler = () => {
-      document.removeEventListener('jux-event', handleJuxEvents);
-      document.addEventListener('jux-event', handleJuxEvents);
-  };
   const initSession = (clientApp, supportedLoginTypes, onUserLogin, backgroundImage, fetchUserBackendUrl, magicLinkRequestEndpoint, magicLinkAuthEndpoint) => {
       // if (startNewDemo()) {
       //   initDemo(setBackendToken, onAuthentication);
@@ -14279,8 +14275,6 @@ var juxWeb = (function (exports) {
       window.store.magicLinkRequestEndpoint = magicLinkRequestEndpoint;
       // @ts-ignore
       window.store.magicLinkAuthEndpoint = magicLinkAuthEndpoint;
-      // TODO: use jux-events to call commands and queries
-      setJuxEventHandler();
       const signInToken = extractTokenFromWindowLocation('sign-in') || extractTokenFromWindowLocation('magic-link');
       if (signInToken) {
           const onOpenMagicLink = () => {
@@ -14573,7 +14567,7 @@ var juxWeb = (function (exports) {
       }
   }
   const query = (element, endpoint, onResult, params, onError) => {
-      element.dispatchEvent(new JuxEvent('GET', endpoint, onResult, params, onError));
+      element.dispatchEvent(new JuxEvent('POST', endpoint, onResult, params, onError));
   };
   const command = (element, endpoint, onResult, params, onError) => {
       element.dispatchEvent(new JuxEvent('POST', endpoint, onResult, params, onError));
@@ -14582,6 +14576,7 @@ var juxWeb = (function (exports) {
   exports.chosenLanguage = chosenLanguage;
   exports.command = command;
   exports.getTranslation = getTranslation;
+  exports.handleJuxEvents = handleJuxEvents;
   exports.handleMagicLinkRequest = handleMagicLinkRequest;
   exports.initLanguage = initLanguage;
   exports.initSession = initSession;

package/dist/login/session.d.ts

@@ -1,6 +1,5 @@
 export declare const setBackendToken: (token: string) => void;
 export declare const onTokenAcquired: (token: string, onUserLogin: any) => void;
-export declare const clearSession: () => void;
 export declare const initSession: (clientApp: HTMLElement, supportedLoginTypes: string[], onUserLogin: any, backgroundImage: string, fetchUserBackendUrl: any, magicLinkRequestEndpoint: string | null, magicLinkAuthEndpoint: string | null) => void;
 export declare const onMicrosoftSignIn: (onUserLogin: any) => Promise<void>;
 export declare const onGoogleSignIn: (onUserLogin: any) => void;

package/dist/main.d.ts

@@ -2,7 +2,7 @@ export { chosenLanguage, reloadWithLanguageOverride, initLanguage, getTranslatio
 export { loginButton } from './login/login-button';
 export { loginPage } from './login/login-page';
 export { handleMagicLinkRequest, initSession, onMicrosoftSignIn } from './login/session';
-export { requestMagicLink } from './api-client';
+export { handleJuxEvents, requestMagicLink } from './api-client';
 export { magicLinkModal } from './login/magic-link-modal';
 export { command, query } from './jux/jux-event';
 declare global {

package/dist/main.esm.js

@@ -157,16 +157,12 @@ const getMagicAuthReqUrl = () => {
     const endpoint = ((_a = window === null || window === void 0 ? void 0 : window.store) === null || _a === void 0 ? void 0 : _a.magicLinkRequestEndpoint) || 'magic-link-request';
     return getBackendUrl() + endpoint + '?email=';
 };
+// TODO: use jux-events to call commands and queries inside jux-web library
 const handleJuxEvents = (ev) => {
-    const { method, endpoint, onResult, params, onError } = ev;
+    const { endpoint, onResult, params, onError } = ev;
     const onJsonResponse = (res) => onResult ? onResult(res) : null;
     const onHelpMessage = (err) => onError ? onError(err) : null;
-    if (method === 'GET') {
-        backendGet(endpoint, params, onJsonResponse, onHelpMessage);
-    }
-    if (method === 'POST') {
-        backendPost(endpoint, params, onJsonResponse, onHelpMessage);
-    }
+    backendPost(endpoint, params, onJsonResponse, onHelpMessage);
 };
 let timeout;
 const maxRetries = 20;
@@ -266,7 +262,8 @@ const backendRequest = (requestType, urlString, params, onJsonResponse, onHelpMe
     req.send(params);
 };
 const backendPost = (endpoint, postContent, onJsonResponse, onHelpMessage) => {
-    backendRequest('POST', getApiUrl() + endpoint, postContent, onJsonResponse, onHelpMessage);
+    const params = JSON.stringify(postContent);
+    backendRequest('POST', getApiUrl() + endpoint, params, onJsonResponse, onHelpMessage);
 };
 const backendGet = (endpoint, params, onJsonResponse, onHelpMessage) => {
     backendRequest('GET', getApiUrl() + endpoint, params, onJsonResponse, onHelpMessage);
@@ -726,7 +723,7 @@ const sendInquiry = (name, email, msg, whatsapp, subject, token) => {
 <strong>Message</strong>: ${getNestedElValue(msg, 'textarea')}`,
         token,
     };
-    backendPost('contact-us', JSON.stringify(inquiryPayload), (_res) => {
+    backendPost('contact-us', inquiryPayload, (_res) => {
         var _a;
         // success(getTranslation('form-success'), Length.long);
         (_a = document.querySelector('#contact-us-modal')) === null || _a === void 0 ? void 0 : _a.remove();
@@ -761,7 +758,7 @@ const contactUsModal = (subject) => {
     if (subject !== 'email-not-sent') {
         // @ts-ignore
         const admin = ((_d = (_c = window.store) === null || _c === void 0 ? void 0 : _c.selectedTeam) === null || _d === void 0 ? void 0 : _d.admin) || window.store.currentUser.email;
-        backendGet(`credits-balance-for?admin=${admin}`, null, (res) => {
+        backendGet('credits-balance-for', { admin }, (res) => {
             const balance = res;
             if (balance <= 0) {
                 form.insertBefore(captcha, btn);
@@ -913,7 +910,10 @@ const onTokenAcquired = (token, onUserLogin) => {
 };
 const clearSession = () => {
     // onUserChanged(null);
+    // TODO: find a better way to preserve backend-url
+    const backendUrl = getBackendUrl(); // Preserve backend, since the authentication was succcessfull
     localStorage.clear();
+    setBackendUrl(backendUrl);
     // @ts-ignore
     window.store = {};
 };
@@ -939,10 +939,6 @@ const displayPage = (clientApp, page) => {
     Array.from(clientApp.children).forEach(el => el.remove());
     clientApp.appendChild(page);
 };
-const setJuxEventHandler = () => {
-    document.removeEventListener('jux-event', handleJuxEvents);
-    document.addEventListener('jux-event', handleJuxEvents);
-};
 const initSession = (clientApp, supportedLoginTypes, onUserLogin, backgroundImage, fetchUserBackendUrl, magicLinkRequestEndpoint, magicLinkAuthEndpoint) => {
     // if (startNewDemo()) {
     //   initDemo(setBackendToken, onAuthentication);
@@ -959,8 +955,6 @@ const initSession = (clientApp, supportedLoginTypes, onUserLogin, backgroundImag
     window.store.magicLinkRequestEndpoint = magicLinkRequestEndpoint;
     // @ts-ignore
     window.store.magicLinkAuthEndpoint = magicLinkAuthEndpoint;
-    // TODO: use jux-events to call commands and queries
-    setJuxEventHandler();
     const signInToken = extractTokenFromWindowLocation('sign-in') || extractTokenFromWindowLocation('magic-link');
     if (signInToken) {
         const onOpenMagicLink = () => {
@@ -1253,10 +1247,10 @@ class JuxEvent extends Event {
     }
 }
 const query = (element, endpoint, onResult, params, onError) => {
-    element.dispatchEvent(new JuxEvent('GET', endpoint, onResult, params, onError));
+    element.dispatchEvent(new JuxEvent('POST', endpoint, onResult, params, onError));
 };
 const command = (element, endpoint, onResult, params, onError) => {
     element.dispatchEvent(new JuxEvent('POST', endpoint, onResult, params, onError));
 };
 
-export { chosenLanguage, command, getTranslation, handleMagicLinkRequest, initLanguage, initSession, loginButton, loginPage, magicLinkModal, onMicrosoftSignIn, query, reloadWithLanguageOverride, requestMagicLink };
+export { chosenLanguage, command, getTranslation, handleJuxEvents, handleMagicLinkRequest, initLanguage, initSession, loginButton, loginPage, magicLinkModal, onMicrosoftSignIn, query, reloadWithLanguageOverride, requestMagicLink };

package/dist/main.js

@@ -181,16 +181,12 @@ const getMagicAuthReqUrl = () => {
     const endpoint = ((_a = window === null || window === void 0 ? void 0 : window.store) === null || _a === void 0 ? void 0 : _a.magicLinkRequestEndpoint) || 'magic-link-request';
     return getBackendUrl() + endpoint + '?email=';
 };
+// TODO: use jux-events to call commands and queries inside jux-web library
 const handleJuxEvents = (ev) => {
-    const { method, endpoint, onResult, params, onError } = ev;
+    const { endpoint, onResult, params, onError } = ev;
     const onJsonResponse = (res) => onResult ? onResult(res) : null;
     const onHelpMessage = (err) => onError ? onError(err) : null;
-    if (method === 'GET') {
-        backendGet(endpoint, params, onJsonResponse, onHelpMessage);
-    }
-    if (method === 'POST') {
-        backendPost(endpoint, params, onJsonResponse, onHelpMessage);
-    }
+    backendPost(endpoint, params, onJsonResponse, onHelpMessage);
 };
 let timeout;
 const maxRetries = 20;
@@ -290,7 +286,8 @@ const backendRequest = (requestType, urlString, params, onJsonResponse, onHelpMe
     req.send(params);
 };
 const backendPost = (endpoint, postContent, onJsonResponse, onHelpMessage) => {
-    backendRequest('POST', getApiUrl() + endpoint, postContent, onJsonResponse, onHelpMessage);
+    const params = JSON.stringify(postContent);
+    backendRequest('POST', getApiUrl() + endpoint, params, onJsonResponse, onHelpMessage);
 };
 const backendGet = (endpoint, params, onJsonResponse, onHelpMessage) => {
     backendRequest('GET', getApiUrl() + endpoint, params, onJsonResponse, onHelpMessage);
@@ -750,7 +747,7 @@ const sendInquiry = (name, email, msg, whatsapp, subject, token) => {
 <strong>Message</strong>: ${getNestedElValue(msg, 'textarea')}`,
         token,
     };
-    backendPost('contact-us', JSON.stringify(inquiryPayload), (_res) => {
+    backendPost('contact-us', inquiryPayload, (_res) => {
         var _a;
         // success(getTranslation('form-success'), Length.long);
         (_a = document.querySelector('#contact-us-modal')) === null || _a === void 0 ? void 0 : _a.remove();
@@ -785,7 +782,7 @@ const contactUsModal = (subject) => {
     if (subject !== 'email-not-sent') {
         // @ts-ignore
         const admin = ((_d = (_c = window.store) === null || _c === void 0 ? void 0 : _c.selectedTeam) === null || _d === void 0 ? void 0 : _d.admin) || window.store.currentUser.email;
-        backendGet(`credits-balance-for?admin=${admin}`, null, (res) => {
+        backendGet('credits-balance-for', { admin }, (res) => {
             const balance = res;
             if (balance <= 0) {
                 form.insertBefore(captcha, btn);
@@ -937,7 +934,10 @@ const onTokenAcquired = (token, onUserLogin) => {
 };
 const clearSession = () => {
     // onUserChanged(null);
+    // TODO: find a better way to preserve backend-url
+    const backendUrl = getBackendUrl(); // Preserve backend, since the authentication was succcessfull
     localStorage.clear();
+    setBackendUrl(backendUrl);
     // @ts-ignore
     window.store = {};
 };
@@ -963,10 +963,6 @@ const displayPage = (clientApp, page) => {
     Array.from(clientApp.children).forEach(el => el.remove());
     clientApp.appendChild(page);
 };
-const setJuxEventHandler = () => {
-    document.removeEventListener('jux-event', handleJuxEvents);
-    document.addEventListener('jux-event', handleJuxEvents);
-};
 const initSession = (clientApp, supportedLoginTypes, onUserLogin, backgroundImage, fetchUserBackendUrl, magicLinkRequestEndpoint, magicLinkAuthEndpoint) => {
     // if (startNewDemo()) {
     //   initDemo(setBackendToken, onAuthentication);
@@ -983,8 +979,6 @@ const initSession = (clientApp, supportedLoginTypes, onUserLogin, backgroundImag
     window.store.magicLinkRequestEndpoint = magicLinkRequestEndpoint;
     // @ts-ignore
     window.store.magicLinkAuthEndpoint = magicLinkAuthEndpoint;
-    // TODO: use jux-events to call commands and queries
-    setJuxEventHandler();
     const signInToken = extractTokenFromWindowLocation('sign-in') || extractTokenFromWindowLocation('magic-link');
     if (signInToken) {
         const onOpenMagicLink = () => {
@@ -1277,7 +1271,7 @@ class JuxEvent extends Event {
     }
 }
 const query = (element, endpoint, onResult, params, onError) => {
-    element.dispatchEvent(new JuxEvent('GET', endpoint, onResult, params, onError));
+    element.dispatchEvent(new JuxEvent('POST', endpoint, onResult, params, onError));
 };
 const command = (element, endpoint, onResult, params, onError) => {
     element.dispatchEvent(new JuxEvent('POST', endpoint, onResult, params, onError));
@@ -1286,6 +1280,7 @@ const command = (element, endpoint, onResult, params, onError) => {
 exports.chosenLanguage = chosenLanguage;
 exports.command = command;
 exports.getTranslation = getTranslation;
+exports.handleJuxEvents = handleJuxEvents;
 exports.handleMagicLinkRequest = handleMagicLinkRequest;
 exports.initLanguage = initLanguage;
 exports.initSession = initSession;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@klauswuestefeld/jux-web",
-  "version": "2024.2.7",
+  "version": "2024.2.8",
   "author": "Jux.House",
   "license": "Copyrighted",
   "description": "",