@klauswuestefeld/jux-web 2024.2.5-1 → 2024.2.6-1

package/dist/api-client.d.ts

@@ -1,10 +1,10 @@
 export declare const setBackendUrl: (backendUrl: string) => void;
-export declare const getGoogleAuthUrl: () => string;
-export declare const getMicrosoftAuthUrl: () => string;
+export declare const handleJuxEvents: (ev: Event) => void;
 export declare const backendRequest: (requestType: string, url: string, postContent: any, onJsonResponse: (response: any) => any, onHelpMessage: (message: string) => any) => void;
 export declare const backendPost: (endpoint: string, postContent: any, onJsonResponse: (response: any) => any, onHelpMessage: (message: string) => any) => void;
-export declare const backendGet: (endpoint: string, onJsonResponse: (response: any) => any, onHelpMessage: (message: string) => any) => void;
-export declare const backendGetPromise: (endpoint: string) => Promise<unknown>;
+export declare const backendGet: (endpoint: string, params: any, onJsonResponse: (response: any) => any, onHelpMessage: (message: string) => any) => void;
 export declare const requestMagicLink: (data: any, onJsonResponse: (response: any) => any) => void;
 export declare const openMagicLink: (magicToken: string, onJsonResponse: (response: any) => any, onHelpMessage: (message: string) => any) => void;
+export declare const googleLogin: (token: string, onLogin: (response: any) => any, onLoginError: (message: string) => any) => void;
+export declare const microsoftLogin: (token: string, onLogin: (response: any) => any, onLoginError: (message: string) => any) => void;
 export declare const getMXData: (domainName: string) => Promise<any>;

package/dist/jux/jux-event.d.ts

@@ -0,0 +1,10 @@
+export declare class JuxEvent extends Event {
+    method: string;
+    endpoint: string;
+    onResult?: (result: any) => any;
+    params: any;
+    onError?: (error: any) => void;
+    constructor(method: string, endpoint: string, onResult?: (result: any) => any, params?: any, onError?: (error: any) => void);
+}
+export declare const query: (element: HTMLElement, endpoint: string, onResult: (result: any) => any, params?: any, onError?: ((error: any) => void) | undefined) => void;
+export declare const command: (element: HTMLElement, endpoint: string, onResult?: ((result: any) => any) | undefined, params?: any, onError?: ((error: any) => void) | undefined) => void;

package/dist/jux-web.js

@@ -144,10 +144,8 @@ var juxWeb = (function (exports) {
   const getBackendUrl = () => process.env.BACKEND_URL || localStorage.getItem('backend-url');
   //@ts-ignore
   const getSecondaryBackendUrl = () => process.env.STAGING_BACKEND_URL || getBackendUrl();
-  let getBackendUrlToTry = () => getBackendUrl();
   const getApiUrl = () => getBackendUrl() + 'api/';
-  const getGoogleAuthUrl = () => getBackendUrl() + 'auth-google?google-id-token=';
-  const getMicrosoftAuthUrl = () => getBackendUrl() + 'auth-microsoft?access-token=';
+  let getBackendUrlToTry = () => getBackendUrl();
   const getMagicAuthUrl = () => {
       var _a;
       // @ts-ignore
@@ -160,6 +158,17 @@ 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=';
   };
+  const handleJuxEvents = (ev) => {
+      const { method, 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);
+      }
+  };
   let timeout;
   const maxRetries = 20;
   let retries = 0;
@@ -253,19 +262,22 @@ var juxWeb = (function (exports) {
   const backendPost = (endpoint, postContent, onJsonResponse, onHelpMessage) => {
       backendRequest('POST', getApiUrl() + endpoint, postContent, onJsonResponse, onHelpMessage);
   };
-  const backendGet = (endpoint, onJsonResponse, onHelpMessage) => {
-      let api = getApiUrl() + endpoint;
-      if (endpoint.includes(getGoogleAuthUrl()) || endpoint.includes(getMicrosoftAuthUrl())) {
-          api = endpoint;
-      }
-      backendRequest('GET', api, undefined, onJsonResponse, onHelpMessage);
+  const backendGet = (endpoint, params, onJsonResponse, onHelpMessage) => {
+      backendRequest('GET', getApiUrl() + endpoint, params, onJsonResponse, onHelpMessage);
   };
-  const backendGetPromise = (endpoint) => new Promise((resolve, reject) => backendGet(endpoint, resolve, reject));
   const requestMagicLink = (data, onJsonResponse) => {
-      backendRequest('GET', getMagicAuthReqUrl() + encodeURIComponent(data.email) + '&destination=' + extractTokenFromWindowLocation('destination') + '&token=' + data.token, undefined, onJsonResponse, () => { });
+      backendRequest('GET', getMagicAuthReqUrl() + encodeURIComponent(data.email) + '&destination=' + extractTokenFromWindowLocation('destination') + '&token=' + data.token, null, onJsonResponse, () => { });
   };
   const openMagicLink = (magicToken, onJsonResponse, onHelpMessage) => {
-      backendRequest('GET', getMagicAuthUrl() + magicToken, undefined, onJsonResponse, onHelpMessage);
+      backendRequest('GET', getMagicAuthUrl() + magicToken, null, onJsonResponse, onHelpMessage);
+  };
+  const googleLogin = (token, onLogin, onLoginError) => {
+      const url = getBackendUrl() + 'auth-google?google-id-token=' + token;
+      backendRequest('GET', url, null, onLogin, onLoginError);
+  };
+  const microsoftLogin = (token, onLogin, onLoginError) => {
+      const url = getBackendUrl() + 'auth-microsoft?access-token=' + token;
+      backendRequest('GET', url, null, onLogin, onLoginError);
   };
   const getMXData = (domainName) => __awaiter$2(void 0, void 0, void 0, function* () {
       try {
@@ -13674,27 +13686,23 @@ var juxWeb = (function (exports) {
           googletoken: gUser.getAuthResponse().id_token
       };
   };
-  const onUserChanged = (googleUser, onUserLogin) => __awaiter$2(void 0, void 0, void 0, function* () {
+  const onUserChanged = (googleUser, onUserLogin) => {
       document.documentElement.classList.remove('progress');
       document.body.classList.remove('disabled');
       if (googleUser) {
           // mixpanelIdentify(googleUser); TODO
-          try {
-              yield backendGetPromise(getGoogleAuthUrl() + googleUser.googletoken)
-                  .then(res => {
-                  const { token } = res;
-                  // @ts-ignore
-                  window.store.currentUser = res;
-                  onTokenAcquired(token, onUserLogin);
-              })
-                  .catch((error) => { throw Error(error); });
-          }
-          catch (error) {
-              console.error(error);
+          const onSuccess = (res) => {
+              const { token } = res;
+              // @ts-ignore
+              window.store.currentUser = res;
+              onTokenAcquired(token, onUserLogin);
+          };
+          const onError = (err) => {
+              console.error(err);
               // logError(error); TODO
               // checkMixpanel(() => mixpanel.track('Login Error', { 'Login Type': 'Google', 'Error': error })); TODO
-              return;
-          }
+          };
+          googleLogin(googleUser.googletoken, onSuccess, onError);
           // checkMixpanel(() => mixpanel.track('Login', { 'Login Type': 'Google' })); TODO
       }
       else {
@@ -13702,7 +13710,7 @@ var juxWeb = (function (exports) {
           // checkMixpanel(() => mixpanel.reset()); TODO
           // displayPage(Page.LOGIN); TODO
       }
-  });
+  };
   const onGoogleUserChanged = (gUser, onUserLogin) => {
       onUserChanged(gUser.isSignedIn() ? highLevelUser(gUser) : null, onUserLogin);
   };
@@ -14064,7 +14072,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}`, (res) => {
+          backendGet(`credits-balance-for?admin=${admin}`, null, (res) => {
               const balance = res;
               if (balance <= 0) {
                   form.insertBefore(captcha, btn);
@@ -14206,6 +14214,10 @@ 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);
@@ -14222,10 +14234,12 @@ var juxWeb = (function (exports) {
       window.store.magicLinkRequestEndpoint = magicLinkRequestEndpoint;
       // @ts-ignore
       window.store.magicLinkAuthEndpoint = magicLinkAuthEndpoint;
-      const magicToken = extractTokenFromWindowLocation('magic-link');
-      if (magicToken) {
+      // TODO: use jux-events to call commands and queries
+      setJuxEventHandler();
+      const signInToken = extractTokenFromWindowLocation('sign-in') || extractTokenFromWindowLocation('magic-link');
+      if (signInToken) {
           const onOpenMagicLink = () => {
-              openMagicLink(magicToken, (res) => onAuthentication(onUserLogin, res, 'Magic Link'), () => onAuthenticationFailure('unable-magic-login'));
+              openMagicLink(signInToken, (res) => onAuthentication(onUserLogin, res, 'Magic Link'), () => onAuthenticationFailure('unable-magic-login'));
           };
           const host = extractTokenFromWindowLocation('host');
           if (host) {
@@ -14240,7 +14254,7 @@ var juxWeb = (function (exports) {
           return;
       }
       if (getBackendToken()) {
-          backendGet('profile', (res) => onAuthentication(onUserLogin, res, 'Token Authentication'), (_err) => onAuthenticationFailure('login-failed'));
+          backendGet('profile', null, (res) => onAuthentication(onUserLogin, res, 'Token Authentication'), (_err) => onAuthenticationFailure('login-failed'));
           return;
       }
       displayPage(clientApp, loginPage(clientApp, backgroundImage, onUserLogin, supportedLoginTypes));
@@ -14264,15 +14278,19 @@ var juxWeb = (function (exports) {
       try {
           const loginResponse = yield msalInstance.loginPopup(loginRequest);
           const { accessToken } = loginResponse;
-          yield backendGetPromise(getMicrosoftAuthUrl() + accessToken)
-              .then((res) => {
+          const onSuccess = (res) => {
               const { token } = res;
               // @ts-ignore
               window.store.currentUser = res;
               onTokenAcquired(token, onUserLogin);
-          })
-              .catch(console.error)
-              .finally(() => disableSignInLayout());
+              disableSignInLayout();
+          };
+          const onError = (err) => {
+              console.error(err);
+              reportError(err);
+              disableSignInLayout();
+          };
+          microsoftLogin(accessToken, onSuccess, onError);
       }
       catch (err) {
           reportError(err);
@@ -14521,19 +14539,25 @@ var juxWeb = (function (exports) {
       return result;
   };
 
-  class Query extends Event {
-      constructor(endpoint, onResult, params, onError) {
-          super(endpoint); // if needed, it is possible to modify bubbles, cancelable and composed properties
-          this.params = params;
+  class JuxEvent extends Event {
+      constructor(method, endpoint, onResult, params, onError) {
+          super('jux-event'); // in the future maybe we might need to modify bubbles, cancelable and composed properties
+          this.method = method;
+          this.endpoint = endpoint;
           this.onResult = onResult;
+          this.params = params;
           this.onError = onError;
       }
   }
   const query = (element, endpoint, onResult, params, onError) => {
-      element.dispatchEvent(new Query(endpoint, onResult, params, onError));
+      element.dispatchEvent(new JuxEvent('GET', endpoint, onResult, params, onError));
+  };
+  const command = (element, endpoint, onResult, params, onError) => {
+      element.dispatchEvent(new JuxEvent('POST', endpoint, onResult, params, onError));
   };
 
   exports.chosenLanguage = chosenLanguage;
+  exports.command = command;
   exports.getTranslation = getTranslation;
   exports.handleMagicLinkRequest = handleMagicLinkRequest;
   exports.initLanguage = initLanguage;

package/dist/main.d.ts

@@ -4,7 +4,7 @@ export { loginPage } from './login/login-page';
 export { handleMagicLinkRequest, initSession, onMicrosoftSignIn } from './login/session';
 export { requestMagicLink } from './api-client';
 export { magicLinkModal } from './login/magic-link-modal';
-export { query } from './jux/query';
+export { command, query } from './jux/jux-event';
 declare global {
     interface Window {
         submitCaptcha: any;

package/dist/main.esm.js

@@ -143,10 +143,8 @@ const setBackendUrl = (backendUrl) => localStorage.setItem('backend-url', backen
 const getBackendUrl = () => process.env.BACKEND_URL || localStorage.getItem('backend-url');
 //@ts-ignore
 const getSecondaryBackendUrl = () => process.env.STAGING_BACKEND_URL || getBackendUrl();
-let getBackendUrlToTry = () => getBackendUrl();
 const getApiUrl = () => getBackendUrl() + 'api/';
-const getGoogleAuthUrl = () => getBackendUrl() + 'auth-google?google-id-token=';
-const getMicrosoftAuthUrl = () => getBackendUrl() + 'auth-microsoft?access-token=';
+let getBackendUrlToTry = () => getBackendUrl();
 const getMagicAuthUrl = () => {
     var _a;
     // @ts-ignore
@@ -159,6 +157,17 @@ 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=';
 };
+const handleJuxEvents = (ev) => {
+    const { method, 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);
+    }
+};
 let timeout;
 const maxRetries = 20;
 let retries = 0;
@@ -252,19 +261,22 @@ const backendRequest = (requestType, url, postContent, onJsonResponse, onHelpMes
 const backendPost = (endpoint, postContent, onJsonResponse, onHelpMessage) => {
     backendRequest('POST', getApiUrl() + endpoint, postContent, onJsonResponse, onHelpMessage);
 };
-const backendGet = (endpoint, onJsonResponse, onHelpMessage) => {
-    let api = getApiUrl() + endpoint;
-    if (endpoint.includes(getGoogleAuthUrl()) || endpoint.includes(getMicrosoftAuthUrl())) {
-        api = endpoint;
-    }
-    backendRequest('GET', api, undefined, onJsonResponse, onHelpMessage);
+const backendGet = (endpoint, params, onJsonResponse, onHelpMessage) => {
+    backendRequest('GET', getApiUrl() + endpoint, params, onJsonResponse, onHelpMessage);
 };
-const backendGetPromise = (endpoint) => new Promise((resolve, reject) => backendGet(endpoint, resolve, reject));
 const requestMagicLink = (data, onJsonResponse) => {
-    backendRequest('GET', getMagicAuthReqUrl() + encodeURIComponent(data.email) + '&destination=' + extractTokenFromWindowLocation('destination') + '&token=' + data.token, undefined, onJsonResponse, () => { });
+    backendRequest('GET', getMagicAuthReqUrl() + encodeURIComponent(data.email) + '&destination=' + extractTokenFromWindowLocation('destination') + '&token=' + data.token, null, onJsonResponse, () => { });
 };
 const openMagicLink = (magicToken, onJsonResponse, onHelpMessage) => {
-    backendRequest('GET', getMagicAuthUrl() + magicToken, undefined, onJsonResponse, onHelpMessage);
+    backendRequest('GET', getMagicAuthUrl() + magicToken, null, onJsonResponse, onHelpMessage);
+};
+const googleLogin = (token, onLogin, onLoginError) => {
+    const url = getBackendUrl() + 'auth-google?google-id-token=' + token;
+    backendRequest('GET', url, null, onLogin, onLoginError);
+};
+const microsoftLogin = (token, onLogin, onLoginError) => {
+    const url = getBackendUrl() + 'auth-microsoft?access-token=' + token;
+    backendRequest('GET', url, null, onLogin, onLoginError);
 };
 const getMXData = (domainName) => __awaiter(void 0, void 0, void 0, function* () {
     try {
@@ -354,27 +366,23 @@ const highLevelUser = (gUser) => {
         googletoken: gUser.getAuthResponse().id_token
     };
 };
-const onUserChanged = (googleUser, onUserLogin) => __awaiter(void 0, void 0, void 0, function* () {
+const onUserChanged = (googleUser, onUserLogin) => {
     document.documentElement.classList.remove('progress');
     document.body.classList.remove('disabled');
     if (googleUser) {
         // mixpanelIdentify(googleUser); TODO
-        try {
-            yield backendGetPromise(getGoogleAuthUrl() + googleUser.googletoken)
-                .then(res => {
-                const { token } = res;
-                // @ts-ignore
-                window.store.currentUser = res;
-                onTokenAcquired(token, onUserLogin);
-            })
-                .catch((error) => { throw Error(error); });
-        }
-        catch (error) {
-            console.error(error);
+        const onSuccess = (res) => {
+            const { token } = res;
+            // @ts-ignore
+            window.store.currentUser = res;
+            onTokenAcquired(token, onUserLogin);
+        };
+        const onError = (err) => {
+            console.error(err);
             // logError(error); TODO
             // checkMixpanel(() => mixpanel.track('Login Error', { 'Login Type': 'Google', 'Error': error })); TODO
-            return;
-        }
+        };
+        googleLogin(googleUser.googletoken, onSuccess, onError);
         // checkMixpanel(() => mixpanel.track('Login', { 'Login Type': 'Google' })); TODO
     }
     else {
@@ -382,7 +390,7 @@ const onUserChanged = (googleUser, onUserLogin) => __awaiter(void 0, void 0, voi
         // checkMixpanel(() => mixpanel.reset()); TODO
         // displayPage(Page.LOGIN); TODO
     }
-});
+};
 const onGoogleUserChanged = (gUser, onUserLogin) => {
     onUserChanged(gUser.isSignedIn() ? highLevelUser(gUser) : null, onUserLogin);
 };
@@ -744,7 +752,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}`, (res) => {
+        backendGet(`credits-balance-for?admin=${admin}`, null, (res) => {
             const balance = res;
             if (balance <= 0) {
                 form.insertBefore(captcha, btn);
@@ -886,6 +894,10 @@ 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);
@@ -902,10 +914,12 @@ const initSession = (clientApp, supportedLoginTypes, onUserLogin, backgroundImag
     window.store.magicLinkRequestEndpoint = magicLinkRequestEndpoint;
     // @ts-ignore
     window.store.magicLinkAuthEndpoint = magicLinkAuthEndpoint;
-    const magicToken = extractTokenFromWindowLocation('magic-link');
-    if (magicToken) {
+    // TODO: use jux-events to call commands and queries
+    setJuxEventHandler();
+    const signInToken = extractTokenFromWindowLocation('sign-in') || extractTokenFromWindowLocation('magic-link');
+    if (signInToken) {
         const onOpenMagicLink = () => {
-            openMagicLink(magicToken, (res) => onAuthentication(onUserLogin, res, 'Magic Link'), () => onAuthenticationFailure('unable-magic-login'));
+            openMagicLink(signInToken, (res) => onAuthentication(onUserLogin, res, 'Magic Link'), () => onAuthenticationFailure('unable-magic-login'));
         };
         const host = extractTokenFromWindowLocation('host');
         if (host) {
@@ -920,7 +934,7 @@ const initSession = (clientApp, supportedLoginTypes, onUserLogin, backgroundImag
         return;
     }
     if (getBackendToken()) {
-        backendGet('profile', (res) => onAuthentication(onUserLogin, res, 'Token Authentication'), (_err) => onAuthenticationFailure('login-failed'));
+        backendGet('profile', null, (res) => onAuthentication(onUserLogin, res, 'Token Authentication'), (_err) => onAuthenticationFailure('login-failed'));
         return;
     }
     displayPage(clientApp, loginPage(clientApp, backgroundImage, onUserLogin, supportedLoginTypes));
@@ -944,15 +958,19 @@ const onMicrosoftSignIn = (onUserLogin) => __awaiter(void 0, void 0, void 0, fun
     try {
         const loginResponse = yield msalInstance.loginPopup(loginRequest);
         const { accessToken } = loginResponse;
-        yield backendGetPromise(getMicrosoftAuthUrl() + accessToken)
-            .then((res) => {
+        const onSuccess = (res) => {
             const { token } = res;
             // @ts-ignore
             window.store.currentUser = res;
             onTokenAcquired(token, onUserLogin);
-        })
-            .catch(console.error)
-            .finally(() => disableSignInLayout());
+            disableSignInLayout();
+        };
+        const onError = (err) => {
+            console.error(err);
+            reportError(err);
+            disableSignInLayout();
+        };
+        microsoftLogin(accessToken, onSuccess, onError);
     }
     catch (err) {
         reportError(err);
@@ -1201,16 +1219,21 @@ const loginPage = (clientApp, backgroundImg, onUserLogin, loginTypes) => {
     return result;
 };
 
-class Query extends Event {
-    constructor(endpoint, onResult, params, onError) {
-        super(endpoint); // if needed, it is possible to modify bubbles, cancelable and composed properties
-        this.params = params;
+class JuxEvent extends Event {
+    constructor(method, endpoint, onResult, params, onError) {
+        super('jux-event'); // in the future maybe we might need to modify bubbles, cancelable and composed properties
+        this.method = method;
+        this.endpoint = endpoint;
         this.onResult = onResult;
+        this.params = params;
         this.onError = onError;
     }
 }
 const query = (element, endpoint, onResult, params, onError) => {
-    element.dispatchEvent(new Query(endpoint, onResult, params, onError));
+    element.dispatchEvent(new JuxEvent('GET', endpoint, onResult, params, onError));
+};
+const command = (element, endpoint, onResult, params, onError) => {
+    element.dispatchEvent(new JuxEvent('POST', endpoint, onResult, params, onError));
 };
 
-export { chosenLanguage, getTranslation, handleMagicLinkRequest, initLanguage, initSession, loginButton, loginPage, magicLinkModal, onMicrosoftSignIn, query, reloadWithLanguageOverride, requestMagicLink };
+export { chosenLanguage, command, getTranslation, handleMagicLinkRequest, initLanguage, initSession, loginButton, loginPage, magicLinkModal, onMicrosoftSignIn, query, reloadWithLanguageOverride, requestMagicLink };

package/dist/main.js

@@ -167,10 +167,8 @@ const setBackendUrl = (backendUrl) => localStorage.setItem('backend-url', backen
 const getBackendUrl = () => process.env.BACKEND_URL || localStorage.getItem('backend-url');
 //@ts-ignore
 const getSecondaryBackendUrl = () => process.env.STAGING_BACKEND_URL || getBackendUrl();
-let getBackendUrlToTry = () => getBackendUrl();
 const getApiUrl = () => getBackendUrl() + 'api/';
-const getGoogleAuthUrl = () => getBackendUrl() + 'auth-google?google-id-token=';
-const getMicrosoftAuthUrl = () => getBackendUrl() + 'auth-microsoft?access-token=';
+let getBackendUrlToTry = () => getBackendUrl();
 const getMagicAuthUrl = () => {
     var _a;
     // @ts-ignore
@@ -183,6 +181,17 @@ 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=';
 };
+const handleJuxEvents = (ev) => {
+    const { method, 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);
+    }
+};
 let timeout;
 const maxRetries = 20;
 let retries = 0;
@@ -276,19 +285,22 @@ const backendRequest = (requestType, url, postContent, onJsonResponse, onHelpMes
 const backendPost = (endpoint, postContent, onJsonResponse, onHelpMessage) => {
     backendRequest('POST', getApiUrl() + endpoint, postContent, onJsonResponse, onHelpMessage);
 };
-const backendGet = (endpoint, onJsonResponse, onHelpMessage) => {
-    let api = getApiUrl() + endpoint;
-    if (endpoint.includes(getGoogleAuthUrl()) || endpoint.includes(getMicrosoftAuthUrl())) {
-        api = endpoint;
-    }
-    backendRequest('GET', api, undefined, onJsonResponse, onHelpMessage);
+const backendGet = (endpoint, params, onJsonResponse, onHelpMessage) => {
+    backendRequest('GET', getApiUrl() + endpoint, params, onJsonResponse, onHelpMessage);
 };
-const backendGetPromise = (endpoint) => new Promise((resolve, reject) => backendGet(endpoint, resolve, reject));
 const requestMagicLink = (data, onJsonResponse) => {
-    backendRequest('GET', getMagicAuthReqUrl() + encodeURIComponent(data.email) + '&destination=' + extractTokenFromWindowLocation('destination') + '&token=' + data.token, undefined, onJsonResponse, () => { });
+    backendRequest('GET', getMagicAuthReqUrl() + encodeURIComponent(data.email) + '&destination=' + extractTokenFromWindowLocation('destination') + '&token=' + data.token, null, onJsonResponse, () => { });
 };
 const openMagicLink = (magicToken, onJsonResponse, onHelpMessage) => {
-    backendRequest('GET', getMagicAuthUrl() + magicToken, undefined, onJsonResponse, onHelpMessage);
+    backendRequest('GET', getMagicAuthUrl() + magicToken, null, onJsonResponse, onHelpMessage);
+};
+const googleLogin = (token, onLogin, onLoginError) => {
+    const url = getBackendUrl() + 'auth-google?google-id-token=' + token;
+    backendRequest('GET', url, null, onLogin, onLoginError);
+};
+const microsoftLogin = (token, onLogin, onLoginError) => {
+    const url = getBackendUrl() + 'auth-microsoft?access-token=' + token;
+    backendRequest('GET', url, null, onLogin, onLoginError);
 };
 const getMXData = (domainName) => __awaiter(void 0, void 0, void 0, function* () {
     try {
@@ -378,27 +390,23 @@ const highLevelUser = (gUser) => {
         googletoken: gUser.getAuthResponse().id_token
     };
 };
-const onUserChanged = (googleUser, onUserLogin) => __awaiter(void 0, void 0, void 0, function* () {
+const onUserChanged = (googleUser, onUserLogin) => {
     document.documentElement.classList.remove('progress');
     document.body.classList.remove('disabled');
     if (googleUser) {
         // mixpanelIdentify(googleUser); TODO
-        try {
-            yield backendGetPromise(getGoogleAuthUrl() + googleUser.googletoken)
-                .then(res => {
-                const { token } = res;
-                // @ts-ignore
-                window.store.currentUser = res;
-                onTokenAcquired(token, onUserLogin);
-            })
-                .catch((error) => { throw Error(error); });
-        }
-        catch (error) {
-            console.error(error);
+        const onSuccess = (res) => {
+            const { token } = res;
+            // @ts-ignore
+            window.store.currentUser = res;
+            onTokenAcquired(token, onUserLogin);
+        };
+        const onError = (err) => {
+            console.error(err);
             // logError(error); TODO
             // checkMixpanel(() => mixpanel.track('Login Error', { 'Login Type': 'Google', 'Error': error })); TODO
-            return;
-        }
+        };
+        googleLogin(googleUser.googletoken, onSuccess, onError);
         // checkMixpanel(() => mixpanel.track('Login', { 'Login Type': 'Google' })); TODO
     }
     else {
@@ -406,7 +414,7 @@ const onUserChanged = (googleUser, onUserLogin) => __awaiter(void 0, void 0, voi
         // checkMixpanel(() => mixpanel.reset()); TODO
         // displayPage(Page.LOGIN); TODO
     }
-});
+};
 const onGoogleUserChanged = (gUser, onUserLogin) => {
     onUserChanged(gUser.isSignedIn() ? highLevelUser(gUser) : null, onUserLogin);
 };
@@ -768,7 +776,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}`, (res) => {
+        backendGet(`credits-balance-for?admin=${admin}`, null, (res) => {
             const balance = res;
             if (balance <= 0) {
                 form.insertBefore(captcha, btn);
@@ -910,6 +918,10 @@ 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);
@@ -926,10 +938,12 @@ const initSession = (clientApp, supportedLoginTypes, onUserLogin, backgroundImag
     window.store.magicLinkRequestEndpoint = magicLinkRequestEndpoint;
     // @ts-ignore
     window.store.magicLinkAuthEndpoint = magicLinkAuthEndpoint;
-    const magicToken = extractTokenFromWindowLocation('magic-link');
-    if (magicToken) {
+    // TODO: use jux-events to call commands and queries
+    setJuxEventHandler();
+    const signInToken = extractTokenFromWindowLocation('sign-in') || extractTokenFromWindowLocation('magic-link');
+    if (signInToken) {
         const onOpenMagicLink = () => {
-            openMagicLink(magicToken, (res) => onAuthentication(onUserLogin, res, 'Magic Link'), () => onAuthenticationFailure('unable-magic-login'));
+            openMagicLink(signInToken, (res) => onAuthentication(onUserLogin, res, 'Magic Link'), () => onAuthenticationFailure('unable-magic-login'));
         };
         const host = extractTokenFromWindowLocation('host');
         if (host) {
@@ -944,7 +958,7 @@ const initSession = (clientApp, supportedLoginTypes, onUserLogin, backgroundImag
         return;
     }
     if (getBackendToken()) {
-        backendGet('profile', (res) => onAuthentication(onUserLogin, res, 'Token Authentication'), (_err) => onAuthenticationFailure('login-failed'));
+        backendGet('profile', null, (res) => onAuthentication(onUserLogin, res, 'Token Authentication'), (_err) => onAuthenticationFailure('login-failed'));
         return;
     }
     displayPage(clientApp, loginPage(clientApp, backgroundImage, onUserLogin, supportedLoginTypes));
@@ -968,15 +982,19 @@ const onMicrosoftSignIn = (onUserLogin) => __awaiter(void 0, void 0, void 0, fun
     try {
         const loginResponse = yield msalInstance.loginPopup(loginRequest);
         const { accessToken } = loginResponse;
-        yield backendGetPromise(getMicrosoftAuthUrl() + accessToken)
-            .then((res) => {
+        const onSuccess = (res) => {
             const { token } = res;
             // @ts-ignore
             window.store.currentUser = res;
             onTokenAcquired(token, onUserLogin);
-        })
-            .catch(console.error)
-            .finally(() => disableSignInLayout());
+            disableSignInLayout();
+        };
+        const onError = (err) => {
+            console.error(err);
+            reportError(err);
+            disableSignInLayout();
+        };
+        microsoftLogin(accessToken, onSuccess, onError);
     }
     catch (err) {
         reportError(err);
@@ -1225,19 +1243,25 @@ const loginPage = (clientApp, backgroundImg, onUserLogin, loginTypes) => {
     return result;
 };
 
-class Query extends Event {
-    constructor(endpoint, onResult, params, onError) {
-        super(endpoint); // if needed, it is possible to modify bubbles, cancelable and composed properties
-        this.params = params;
+class JuxEvent extends Event {
+    constructor(method, endpoint, onResult, params, onError) {
+        super('jux-event'); // in the future maybe we might need to modify bubbles, cancelable and composed properties
+        this.method = method;
+        this.endpoint = endpoint;
         this.onResult = onResult;
+        this.params = params;
         this.onError = onError;
     }
 }
 const query = (element, endpoint, onResult, params, onError) => {
-    element.dispatchEvent(new Query(endpoint, onResult, params, onError));
+    element.dispatchEvent(new JuxEvent('GET', endpoint, onResult, params, onError));
+};
+const command = (element, endpoint, onResult, params, onError) => {
+    element.dispatchEvent(new JuxEvent('POST', endpoint, onResult, params, onError));
 };
 
 exports.chosenLanguage = chosenLanguage;
+exports.command = command;
 exports.getTranslation = getTranslation;
 exports.handleMagicLinkRequest = handleMagicLinkRequest;
 exports.initLanguage = initLanguage;

package/package.json

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

package/dist/jux/query.d.ts

@@ -1 +0,0 @@
-export declare const query: (element: HTMLElement, endpoint: string, onResult: (result: any) => void, params?: any, onError?: ((error: any) => void) | undefined) => void;