@klauswuestefeld/jux-web 2024.11.12 → 2024.11.25

package/dist/api-client.d.ts

@@ -1,13 +1,13 @@
 export declare const setBackendUrl: (backendUrl: string) => void;
 export declare const getBackendUrl: () => string;
 export declare const handleJuxEvent: (ev: Event) => void;
-export declare const backendRequest: (url: string, options: any, onSuccess: any, onError: any, onRedirect?: any, requestType?: string, handleUnauthorized?: () => void, retrial?: boolean, retrialNum?: number) => Promise<any>;
+export declare const backendRequest: (url: string, options: any, onSuccess: any, onError: any, onRedirect?: any, requestType?: string, handleUnauthorized?: (res: any) => void, retrial?: boolean, retrialNum?: number) => Promise<any>;
 export declare const backendPost: (endpoint: string, postContent: any, onJsonResponse: (response: any) => any, onHelpMessage: (message: string) => any) => void;
-export declare const backendGet: (endpoint: string, params: any, onJsonResponse: (response: any) => any, onHelpMessage: (message: string) => any) => void;
+export declare const backendGet: (endpoint: string, params: any, onJsonResponse: (response: any) => any, onHelpMessage: (message: string) => any, handleUnauthorized?: any) => void;
 export declare const requestMagicLink: (data: any, onJsonResponse: (response: any) => any, onUnauthorized: () => void) => 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 getSSOAuthorizationEndpoint: (onSuccess: (response: any) => any, onError: (message: string) => any) => void;
-export declare const validateSSOToken: (token: string, redirectUri: string, onLogin: (response: any) => any, onError: (message: string) => any) => void;
+export declare const validateSSOToken: (token: string, redirectUri: string, onLogin: (response: any) => any, onError: (message: string) => any, handleUnauthorized: (response: any) => void) => void;
 export declare const getMXData: (domainName: string) => Promise<any>;

package/dist/jux-web.js

@@ -279,7 +279,8 @@ var juxWeb = (function (exports) {
           return;
       }
       if (response.status === 401) {
-          handleUnauthorized();
+          requestRunning = false;
+          handleUnauthorized(response);
           return;
       }
       try {
@@ -319,7 +320,7 @@ var juxWeb = (function (exports) {
       }
       return backendRequest(getApiUrl() + endpoint, options, onSuccess, onError, onRedirect, requestType);
   };
-  const get = (endpoint, onSuccess, onError, onRedirect) => {
+  const get = (endpoint, onSuccess, onError, onRedirect, handleUnauthorized) => {
       const options = {
           method: 'GET',
           headers: {
@@ -327,12 +328,12 @@ var juxWeb = (function (exports) {
               'Content-Type': 'application/json',
           }
       };
-      return backendRequest(getApiUrl() + endpoint, options, onSuccess, onError, onRedirect);
+      return backendRequest(getApiUrl() + endpoint, options, onSuccess, onError, onRedirect, 'query', handleUnauthorized);
   };
   const backendPost = (endpoint, postContent, onJsonResponse, onHelpMessage) => {
       post(endpoint, postContent, onJsonResponse, onHelpMessage);
   };
-  const backendGet = (endpoint, params, onJsonResponse, onHelpMessage) => {
+  const backendGet = (endpoint, params, onJsonResponse, onHelpMessage, handleUnauthorized) => {
       if (params) {
           endpoint += '?';
           Object.keys(params).forEach((k, i) => {
@@ -341,7 +342,7 @@ var juxWeb = (function (exports) {
               endpoint += `${k}=${params[k]}`;
           });
       }
-      get(endpoint, onJsonResponse, onHelpMessage);
+      get(endpoint, onJsonResponse, onHelpMessage, null, handleUnauthorized);
   };
   const requestMagicLink = (data, onJsonResponse, onUnauthorized) => {
       const { email, token } = data;
@@ -363,8 +364,8 @@ var juxWeb = (function (exports) {
   const getSSOAuthorizationEndpoint = (onSuccess, onError) => {
       backendGet('openid/authorization-endpoint', null, onSuccess, onError);
   };
-  const validateSSOToken = (token, redirectUri, onLogin, onError) => {
-      backendGet('openid/callback', { code: token, 'redirect-uri': redirectUri }, onLogin, onError);
+  const validateSSOToken = (token, redirectUri, onLogin, onError, handleUnauthorized) => {
+      backendGet('openid/callback', { code: token, 'redirect-uri': redirectUri }, onLogin, onError, handleUnauthorized);
   };
   const getMXData = (domainName) => __awaiter$2(void 0, void 0, void 0, function* () {
       try {
@@ -14344,6 +14345,14 @@ var juxWeb = (function (exports) {
       const { protocol, host } = window.location;
       return protocol + '//' + host + '/callback';
   };
+  const handleSSOLogin = () => {
+      const onSuccess = (authEndpoint) => {
+          const authUrl = authEndpoint + `&redirect_uri=${getSSOCallbackURI()}`;
+          window.location.replace(authUrl);
+      };
+      const onError = () => onAuthenticationFailure('login-failed');
+      getSSOAuthorizationEndpoint(onSuccess, onError);
+  };
   const initSession = (clientApp, supportedLoginTypes, onUserLogin, backgroundImage, fetchUserBackendUrl, magicLinkRequestEndpoint, magicLinkAuthEndpoint) => {
       // if (startNewDemo()) {
       //   initDemo(setBackendToken, onAuthentication);
@@ -14383,7 +14392,19 @@ var juxWeb = (function (exports) {
       }
       const ssoToken = extractTokenFromWindowLocation('code');
       if (ssoToken) {
-          validateSSOToken(ssoToken, getSSOCallbackURI(), (res) => onAuthentication(onUserLogin, res, 'SSO Authentication'), () => onAuthenticationFailure('login-failed'));
+          validateSSOToken(ssoToken, getSSOCallbackURI(), (res) => onAuthentication(onUserLogin, res, 'SSO Authentication'), (_res) => onAuthenticationFailure('login-failed'), (res) => __awaiter$2(void 0, void 0, void 0, function* () {
+              const jsonResponse = yield res.json();
+              const unauthorizedEmail = jsonResponse.email;
+              const onReturn = () => handleSSOLogin();
+              const page = unauthorizedMagicLinkRequestPage(backgroundImage, onReturn);
+              const magicLinkEmail = page.querySelector('#magic-link-email');
+              magicLinkEmail.textContent = unauthorizedEmail;
+              displayPage(clientApp, page);
+          }));
+          return;
+      }
+      if (supportedLoginTypes.includes('SSO')) {
+          handleSSOLogin();
           return;
       }
       displayPage(clientApp, loginPage(clientApp, backgroundImage, onUserLogin, supportedLoginTypes));
@@ -14428,14 +14449,6 @@ var juxWeb = (function (exports) {
           authSignIn(onUserLogin);
       }, onCookieError);
   };
-  const handleSSOLogin = () => {
-      const onSuccess = (authEndpoint) => {
-          const authUrl = authEndpoint + `&redirect_uri=${getSSOCallbackURI()}`;
-          window.location.replace(authUrl);
-      };
-      const onError = () => onAuthenticationFailure('login-failed');
-      getSSOAuthorizationEndpoint(onSuccess, onError);
-  };
   const handleMagicLinkRequest = (token, onReturn, backgroundImage, currentPage, clientBody, email = '') => {
       if (!email) {
           const mailMagic = document.querySelector('#mail-magic');
@@ -14629,9 +14642,6 @@ var juxWeb = (function (exports) {
       if (loginTypes.includes('Email')) {
           section.appendChild(loginButton('Email', () => onEmailLoginRequest(clientApp, loginPage, onUserLogin, backgroundImg, loginTypes)));
       }
-      if (loginTypes.includes('SSO')) {
-          section.appendChild(loginButton('SSO', () => handleSSOLogin()));
-      }
   };
   const loginPage = (clientApp, backgroundImg, onUserLogin, loginTypes) => {
       const content = [];

package/dist/login/session.d.ts

@@ -3,5 +3,4 @@ export declare const onTokenAcquired: (token: string, onUserLogin: any) => 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;
-export declare const handleSSOLogin: () => void;
 export declare const handleMagicLinkRequest: (token: string | null, onReturn: any, backgroundImage: string, currentPage: HTMLElement, clientBody: HTMLElement, email?: string) => void;

package/dist/main.esm.js

@@ -278,7 +278,8 @@ const backendRequest = (url_1, options_1, onSuccess_1, onError_1, onRedirect_1,
         return;
     }
     if (response.status === 401) {
-        handleUnauthorized();
+        requestRunning = false;
+        handleUnauthorized(response);
         return;
     }
     try {
@@ -318,7 +319,7 @@ const post = (endpoint, body, onSuccess, onError, onRedirect, requestType = "que
     }
     return backendRequest(getApiUrl() + endpoint, options, onSuccess, onError, onRedirect, requestType);
 };
-const get = (endpoint, onSuccess, onError, onRedirect) => {
+const get = (endpoint, onSuccess, onError, onRedirect, handleUnauthorized) => {
     const options = {
         method: 'GET',
         headers: {
@@ -326,12 +327,12 @@ const get = (endpoint, onSuccess, onError, onRedirect) => {
             'Content-Type': 'application/json',
         }
     };
-    return backendRequest(getApiUrl() + endpoint, options, onSuccess, onError, onRedirect);
+    return backendRequest(getApiUrl() + endpoint, options, onSuccess, onError, onRedirect, 'query', handleUnauthorized);
 };
 const backendPost = (endpoint, postContent, onJsonResponse, onHelpMessage) => {
     post(endpoint, postContent, onJsonResponse, onHelpMessage);
 };
-const backendGet = (endpoint, params, onJsonResponse, onHelpMessage) => {
+const backendGet = (endpoint, params, onJsonResponse, onHelpMessage, handleUnauthorized) => {
     if (params) {
         endpoint += '?';
         Object.keys(params).forEach((k, i) => {
@@ -340,7 +341,7 @@ const backendGet = (endpoint, params, onJsonResponse, onHelpMessage) => {
             endpoint += `${k}=${params[k]}`;
         });
     }
-    get(endpoint, onJsonResponse, onHelpMessage);
+    get(endpoint, onJsonResponse, onHelpMessage, null, handleUnauthorized);
 };
 const requestMagicLink = (data, onJsonResponse, onUnauthorized) => {
     const { email, token } = data;
@@ -362,8 +363,8 @@ const microsoftLogin = (token, onLogin, onLoginError) => {
 const getSSOAuthorizationEndpoint = (onSuccess, onError) => {
     backendGet('openid/authorization-endpoint', null, onSuccess, onError);
 };
-const validateSSOToken = (token, redirectUri, onLogin, onError) => {
-    backendGet('openid/callback', { code: token, 'redirect-uri': redirectUri }, onLogin, onError);
+const validateSSOToken = (token, redirectUri, onLogin, onError, handleUnauthorized) => {
+    backendGet('openid/callback', { code: token, 'redirect-uri': redirectUri }, onLogin, onError, handleUnauthorized);
 };
 const getMXData = (domainName) => __awaiter(void 0, void 0, void 0, function* () {
     try {
@@ -1024,6 +1025,14 @@ const getSSOCallbackURI = () => {
     const { protocol, host } = window.location;
     return protocol + '//' + host + '/callback';
 };
+const handleSSOLogin = () => {
+    const onSuccess = (authEndpoint) => {
+        const authUrl = authEndpoint + `&redirect_uri=${getSSOCallbackURI()}`;
+        window.location.replace(authUrl);
+    };
+    const onError = () => onAuthenticationFailure('login-failed');
+    getSSOAuthorizationEndpoint(onSuccess, onError);
+};
 const initSession = (clientApp, supportedLoginTypes, onUserLogin, backgroundImage, fetchUserBackendUrl, magicLinkRequestEndpoint, magicLinkAuthEndpoint) => {
     // if (startNewDemo()) {
     //   initDemo(setBackendToken, onAuthentication);
@@ -1063,7 +1072,19 @@ const initSession = (clientApp, supportedLoginTypes, onUserLogin, backgroundImag
     }
     const ssoToken = extractTokenFromWindowLocation('code');
     if (ssoToken) {
-        validateSSOToken(ssoToken, getSSOCallbackURI(), (res) => onAuthentication(onUserLogin, res, 'SSO Authentication'), () => onAuthenticationFailure('login-failed'));
+        validateSSOToken(ssoToken, getSSOCallbackURI(), (res) => onAuthentication(onUserLogin, res, 'SSO Authentication'), (_res) => onAuthenticationFailure('login-failed'), (res) => __awaiter(void 0, void 0, void 0, function* () {
+            const jsonResponse = yield res.json();
+            const unauthorizedEmail = jsonResponse.email;
+            const onReturn = () => handleSSOLogin();
+            const page = unauthorizedMagicLinkRequestPage(backgroundImage, onReturn);
+            const magicLinkEmail = page.querySelector('#magic-link-email');
+            magicLinkEmail.textContent = unauthorizedEmail;
+            displayPage(clientApp, page);
+        }));
+        return;
+    }
+    if (supportedLoginTypes.includes('SSO')) {
+        handleSSOLogin();
         return;
     }
     displayPage(clientApp, loginPage(clientApp, backgroundImage, onUserLogin, supportedLoginTypes));
@@ -1108,14 +1129,6 @@ const onGoogleSignIn = (onUserLogin) => {
         authSignIn(onUserLogin);
     }, onCookieError);
 };
-const handleSSOLogin = () => {
-    const onSuccess = (authEndpoint) => {
-        const authUrl = authEndpoint + `&redirect_uri=${getSSOCallbackURI()}`;
-        window.location.replace(authUrl);
-    };
-    const onError = () => onAuthenticationFailure('login-failed');
-    getSSOAuthorizationEndpoint(onSuccess, onError);
-};
 const handleMagicLinkRequest = (token, onReturn, backgroundImage, currentPage, clientBody, email = '') => {
     if (!email) {
         const mailMagic = document.querySelector('#mail-magic');
@@ -1309,9 +1322,6 @@ const appendLoginTypes = (loginPage, section, clientApp, onUserLogin, loginTypes
     if (loginTypes.includes('Email')) {
         section.appendChild(loginButton('Email', () => onEmailLoginRequest(clientApp, loginPage, onUserLogin, backgroundImg, loginTypes)));
     }
-    if (loginTypes.includes('SSO')) {
-        section.appendChild(loginButton('SSO', () => handleSSOLogin()));
-    }
 };
 const loginPage = (clientApp, backgroundImg, onUserLogin, loginTypes) => {
     const content = [];

package/dist/main.js

@@ -302,7 +302,8 @@ const backendRequest = (url_1, options_1, onSuccess_1, onError_1, onRedirect_1,
         return;
     }
     if (response.status === 401) {
-        handleUnauthorized();
+        requestRunning = false;
+        handleUnauthorized(response);
         return;
     }
     try {
@@ -342,7 +343,7 @@ const post = (endpoint, body, onSuccess, onError, onRedirect, requestType = "que
     }
     return backendRequest(getApiUrl() + endpoint, options, onSuccess, onError, onRedirect, requestType);
 };
-const get = (endpoint, onSuccess, onError, onRedirect) => {
+const get = (endpoint, onSuccess, onError, onRedirect, handleUnauthorized) => {
     const options = {
         method: 'GET',
         headers: {
@@ -350,12 +351,12 @@ const get = (endpoint, onSuccess, onError, onRedirect) => {
             'Content-Type': 'application/json',
         }
     };
-    return backendRequest(getApiUrl() + endpoint, options, onSuccess, onError, onRedirect);
+    return backendRequest(getApiUrl() + endpoint, options, onSuccess, onError, onRedirect, 'query', handleUnauthorized);
 };
 const backendPost = (endpoint, postContent, onJsonResponse, onHelpMessage) => {
     post(endpoint, postContent, onJsonResponse, onHelpMessage);
 };
-const backendGet = (endpoint, params, onJsonResponse, onHelpMessage) => {
+const backendGet = (endpoint, params, onJsonResponse, onHelpMessage, handleUnauthorized) => {
     if (params) {
         endpoint += '?';
         Object.keys(params).forEach((k, i) => {
@@ -364,7 +365,7 @@ const backendGet = (endpoint, params, onJsonResponse, onHelpMessage) => {
             endpoint += `${k}=${params[k]}`;
         });
     }
-    get(endpoint, onJsonResponse, onHelpMessage);
+    get(endpoint, onJsonResponse, onHelpMessage, null, handleUnauthorized);
 };
 const requestMagicLink = (data, onJsonResponse, onUnauthorized) => {
     const { email, token } = data;
@@ -386,8 +387,8 @@ const microsoftLogin = (token, onLogin, onLoginError) => {
 const getSSOAuthorizationEndpoint = (onSuccess, onError) => {
     backendGet('openid/authorization-endpoint', null, onSuccess, onError);
 };
-const validateSSOToken = (token, redirectUri, onLogin, onError) => {
-    backendGet('openid/callback', { code: token, 'redirect-uri': redirectUri }, onLogin, onError);
+const validateSSOToken = (token, redirectUri, onLogin, onError, handleUnauthorized) => {
+    backendGet('openid/callback', { code: token, 'redirect-uri': redirectUri }, onLogin, onError, handleUnauthorized);
 };
 const getMXData = (domainName) => __awaiter(void 0, void 0, void 0, function* () {
     try {
@@ -1048,6 +1049,14 @@ const getSSOCallbackURI = () => {
     const { protocol, host } = window.location;
     return protocol + '//' + host + '/callback';
 };
+const handleSSOLogin = () => {
+    const onSuccess = (authEndpoint) => {
+        const authUrl = authEndpoint + `&redirect_uri=${getSSOCallbackURI()}`;
+        window.location.replace(authUrl);
+    };
+    const onError = () => onAuthenticationFailure('login-failed');
+    getSSOAuthorizationEndpoint(onSuccess, onError);
+};
 const initSession = (clientApp, supportedLoginTypes, onUserLogin, backgroundImage, fetchUserBackendUrl, magicLinkRequestEndpoint, magicLinkAuthEndpoint) => {
     // if (startNewDemo()) {
     //   initDemo(setBackendToken, onAuthentication);
@@ -1087,7 +1096,19 @@ const initSession = (clientApp, supportedLoginTypes, onUserLogin, backgroundImag
     }
     const ssoToken = extractTokenFromWindowLocation('code');
     if (ssoToken) {
-        validateSSOToken(ssoToken, getSSOCallbackURI(), (res) => onAuthentication(onUserLogin, res, 'SSO Authentication'), () => onAuthenticationFailure('login-failed'));
+        validateSSOToken(ssoToken, getSSOCallbackURI(), (res) => onAuthentication(onUserLogin, res, 'SSO Authentication'), (_res) => onAuthenticationFailure('login-failed'), (res) => __awaiter(void 0, void 0, void 0, function* () {
+            const jsonResponse = yield res.json();
+            const unauthorizedEmail = jsonResponse.email;
+            const onReturn = () => handleSSOLogin();
+            const page = unauthorizedMagicLinkRequestPage(backgroundImage, onReturn);
+            const magicLinkEmail = page.querySelector('#magic-link-email');
+            magicLinkEmail.textContent = unauthorizedEmail;
+            displayPage(clientApp, page);
+        }));
+        return;
+    }
+    if (supportedLoginTypes.includes('SSO')) {
+        handleSSOLogin();
         return;
     }
     displayPage(clientApp, loginPage(clientApp, backgroundImage, onUserLogin, supportedLoginTypes));
@@ -1132,14 +1153,6 @@ const onGoogleSignIn = (onUserLogin) => {
         authSignIn(onUserLogin);
     }, onCookieError);
 };
-const handleSSOLogin = () => {
-    const onSuccess = (authEndpoint) => {
-        const authUrl = authEndpoint + `&redirect_uri=${getSSOCallbackURI()}`;
-        window.location.replace(authUrl);
-    };
-    const onError = () => onAuthenticationFailure('login-failed');
-    getSSOAuthorizationEndpoint(onSuccess, onError);
-};
 const handleMagicLinkRequest = (token, onReturn, backgroundImage, currentPage, clientBody, email = '') => {
     if (!email) {
         const mailMagic = document.querySelector('#mail-magic');
@@ -1333,9 +1346,6 @@ const appendLoginTypes = (loginPage, section, clientApp, onUserLogin, loginTypes
     if (loginTypes.includes('Email')) {
         section.appendChild(loginButton('Email', () => onEmailLoginRequest(clientApp, loginPage, onUserLogin, backgroundImg, loginTypes)));
     }
-    if (loginTypes.includes('SSO')) {
-        section.appendChild(loginButton('SSO', () => handleSSOLogin()));
-    }
 };
 const loginPage = (clientApp, backgroundImg, onUserLogin, loginTypes) => {
     const content = [];

package/package.json

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